diff --git a/admin/themes/default/template/controllers/search/helpers/view/view.tpl b/admin/themes/default/template/controllers/search/helpers/view/view.tpl
index 2e9059abb..a9619ae01 100644
--- a/admin/themes/default/template/controllers/search/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/search/helpers/view/view.tpl
@@ -121,6 +121,19 @@ $(function() {
 		</div>
 	{/if}
 
+	{if isset($num_hotel_amenities) && $num_hotel_amenities}
+		<div class="panel">
+			<h3>
+				{if $num_hotel_amenities == 1}
+					{l s='1 hotel amenity'}
+				{else}
+					{l s='%d hotel amenities' sprintf=$num_hotel_amenities}
+				{/if}
+			</h3>
+			{$hotel_amenities}
+		</div>
+	{/if}
+
 	{if isset($num_hotel_features) && $num_hotel_features}
 		<div class="panel">
 			<h3>
diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php
index efcb04045..876780463 100644
--- a/controllers/admin/AdminSearchController.php
+++ b/controllers/admin/AdminSearchController.php
@@ -189,7 +189,6 @@ class AdminSearchControllerCore extends AdminController
 
             if (!$searchType) {
                 $this->searchAddress();
-                $this->searchHotelFeatures();
                 $this->searchHotelAmenities();
                 $this->searchRefundRules();
             }
@@ -435,6 +434,7 @@ class AdminSearchControllerCore extends AdminController
                 if ($hotelAmenities = $objHotelAmenities->searchByName($this->query, $this->context->language->id)) {
                     $amenities = array();
                     foreach ($hotelAmenities as $key => $hotelAmenity) {
+                        $amenities[$hotelAmenity['id_amenity']]['id_amenity'] = $hotelAmenity['id_amenity'];
                         $amenities[$hotelAmenity['id_amenity']]['name'] = $hotelAmenity['name'];
                         if ($hotelAmenity['id_parent']) {
                             $amenities[$hotelAmenity['id_amenity']]['id'] = $hotelAmenity['id_parent'];
@@ -818,10 +818,10 @@ class AdminSearchControllerCore extends AdminController
                 $helper = new HelperList();
                 $helper->shopLinkType = '';
                 $helper->simple_header = true;
-                $helper->identifier = 'id_customer_message';
-                $helper->actions = array('edit');
+                $helper->identifier = 'id_customer_thread';
+                $helper->actions = array('view');
                 $helper->show_toolbar = false;
-                $helper->table = 'feature';
+                $helper->table = 'customer_thread';
                 $helper->currentIndex = $this->context->link->getAdminLink('AdminCustomerThreads', false);
 
                 $query = trim(Tools::getValue('bo_query'));