diff --git a/addons/website_event_track/static/src/js/website_event_track.js b/addons/website_event_track/static/src/js/website_event_track.js
index a8c61cc7508..f26c4c406e2 100644
--- a/addons/website_event_track/static/src/js/website_event_track.js
+++ b/addons/website_event_track/static/src/js/website_event_track.js
@@ -1,13 +1,29 @@
 $(document).ready(function() {
-    var search_object = {};
-    $.each($("td#seach_enable"), function(key, element){
-        var value_td = ($(element).text()).trim();
-        if(value_td)search_object[key] = [value_td.toLowerCase(), element];
-    });
-    $("#start_search").bind('keyup',function(e){
-        var change_text = ($(this).val()).toLowerCase();
-        $.each(search_object, function(key, value){
-            $(value[1]).css("visibility", (value[0].indexOf(change_text) < 0)?'hidden':'visible');
+    function set_value(td_contain){
+        var search_object = {};
+        var self = this;
+        $.each(td_contain, function(key, element2){
+            var value_td = ($(element2).find("a").text()).trim();
+            if(value_td)search_object[key] = [value_td.toLowerCase(), element2];
+        });
+        return search_object;
+    };
+    $.each($("table#table_search"), function(key, element){
+        $.each($("tr#agenda_tr"),function(key, element1){
+            var th_child = $(element1).siblings("#agenda_th").children().length;
+            var tr_child = $(element1).children();
+            var td_contain = $(tr_child).filter("td#seach_enable");
+            if(th_child == tr_child.length && td_contain.length == 0){
+                $(element1).remove();
+            }
+        });
+        var search_object = set_value($(element).find("td#seach_enable"));
+        var element_search = $(element).prev().find("#start_search");
+        $(element_search).bind('keyup',function(e){
+            var change_text = ($(this).val()).toLowerCase();
+            $.each(search_object, function(key, value){
+                $(value[1]).css("visibility", (value[0].indexOf(change_text) < 0)?'hidden':'visible');
+            });
         });
     });
 });
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 2f12ae4778d..e2f2fb17c9f 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -67,7 +67,7 @@
                         <t t-set="td_width" t-value="90/len(room_list)"/>
                         <t t-set="index" t-value="0"/>
                         <t t-set="for_all" t-value="True"/>
-                        <tr>
+                        <tr id="agenda_th">
                             <th t-attf-style="width:#{10}%;"> </th>
                             <t t-foreach="room_list" t-as="room">
                                 <th t-attf-style="width: #{td_width}px;" class="active"><bold><t t-esc="room[1]"/></bold></th>
@@ -75,7 +75,7 @@
                         </tr>
                         <t t-foreach="days[day]" t-as="slot">
                             <t t-set="skip_it" t-value="skip_td[day].keys()"/>
-                            <tr>
+                            <tr id="agenda_tr">
                                 <td t-attf-style="width:#{10}%;"><t t-esc= "slot"/></td>
                                 <t t-foreach="room_list" t-as="room">
                                     <t t-set="sid" t-value="not (room[0] in skip_it and slot in skip_td[day][room[0]])" />