diff --git a/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-debug.js b/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-debug.js
index 34cc92a6a4b..617edac493c 100644
--- a/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-debug.js
+++ b/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-debug.js
@@ -181,8 +181,6 @@ Y.extend(EventFilter, Y.Base, {
     _totalFilter: function() {
         // Get all of the details of the filter elements
         var eventNameFilter = this._eventName.get('value').toLowerCase(),
-            // Component selected text.
-            componentFilter = this._component.get('options').item(this._component.get('selectedIndex')).get('text').toLowerCase(),
             // Component selected value.
             componentValue = this._component.get('value'),
             // Education level selected text.
@@ -201,7 +199,7 @@ Y.extend(EventFilter, Y.Base, {
             // These variables will either be false or true depending on the statement outcome.
             var fullEventText = Y.Node.create(this.get('tabledata')[i].fulleventname).get('text'),
                 eventNameValue = fullEventText.toLowerCase().indexOf(eventNameFilter) >= 0,
-                componentFilterValue = this.get('tabledata')[i].component.toLowerCase().indexOf(componentFilter) >= 0,
+                componentFilterValue = fullEventText.toLowerCase().indexOf('\\' + componentValue + '\\event\\') >= 0,
                 eduLevelFilterValue = this.get('tabledata')[i].edulevel.toLowerCase().indexOf(eduLevelFilter) >= 0,
                 crudFilterValue = this.get('tabledata')[i].crud.toLowerCase().indexOf(crudFilter) >= 0;
             // If the name field is empty then add to the filter.
diff --git a/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-min.js b/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-min.js
index 292bdc17e6d..110843d3546 100644
--- a/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-min.js
+++ b/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-min.js
@@ -1 +1 @@
-YUI.add("moodle-report_eventlist-eventfilter",function(g,e){function t(){t.superclass.constructor.apply(this,arguments)}var l="#id_eventname",n="#id_eventcomponent",i="#id_eventedulevel",a="#id_eventcrud",r="#id_filterbutton",s="#id_clearbutton";g.extend(t,g.Base,{_table:null,_eventName:null,_component:null,_eduLevel:null,_crud:null,initializer:function(){var e=g.one(r),t=g.one(s);this._createTable(this.get("tabledata")),this._eventName=g.one(l),this._component=g.one(n),this._eduLevel=g.one(i),this._crud=g.one(a),this._eventName.on("valuechange",this._totalFilter,this),e.on("click",this._totalFilter,this),t.on("click",this._clearFilter,this)},_createTable:function(e){var t=new g.DataTable({columns:[{key:"fulleventname",label:M.util.get_string("eventname","report_eventlist"),allowHTML:!0,sortable:!0,sortFn:function(e,t,l){var n=e.getAttrs().raweventname,i=t.getAttrs().raweventname<n?1:-1;return l?-i:i},title:M.util.get_string("eventname","report_eventlist")},{key:"component",label:M.util.get_string("component","report_eventlist"),allowHTML:!0,sortable:!0,title:M.util.get_string("component","report_eventlist")},{key:"edulevel",label:M.util.get_string("edulevel","report_eventlist"),sortable:!0,title:M.util.get_string("edulevel","report_eventlist")},{key:"crud",label:M.util.get_string("crud","report_eventlist"),sortable:!0,title:M.util.get_string("crud","report_eventlist")},{key:"objecttable",label:M.util.get_string("affectedtable","report_eventlist"),sortable:!0,title:M.util.get_string("affectedtable","report_eventlist")},{key:"since",label:M.util.get_string("since","report_eventlist"),sortable:!0,title:M.util.get_string("since","report_eventlist")},{key:"legacyevent",label:M.util.get_string("legacyevent","report_eventlist"),sortable:!0,title:M.util.get_string("legacyevent","report_eventlist")}],data:e,strings:{sortBy:"{title}",reverseSortBy:"{title}"}});return t.render("#report-eventlist-table"),t.get("boundingBox").addClass("report-eventlist-datatable-table"),this._table=t,this},_totalFilter:function(){var e,t,l,n,i,a=this._eventName.get("value").toLowerCase(),r=this._component.get("options").item(this._component.get("selectedIndex")).get("text").toLowerCase(),s=this._component.get("value"),o=this._eduLevel.get("options").item(this._eduLevel.get("selectedIndex")).get("text").toLowerCase(),u=this._eduLevel.get("value"),_=this._crud.get("options").item(this._crud.get("selectedIndex")).get("text").toLowerCase(),v=this._crud.get("value"),d=[];for(e=0;e<this.get("tabledata").length;e++)t=0<=g.Node.create(this.get("tabledata")[e].fulleventname).get("text").toLowerCase().indexOf(a),l=0<=this.get("tabledata")[e].component.toLowerCase().indexOf(r),n=0<=this.get("tabledata")[e].edulevel.toLowerCase().indexOf(o),i=0<=this.get("tabledata")[e].crud.toLowerCase().indexOf(_),""===a&&(t=!0),"0"===s&&(l=!0),"0"===u&&(n=!0),"0"===v&&(i=!0),t&&l&&n&&i&&d.push(this.get("tabledata")[e]);this._table.set("data",d)},_clearFilter:function(){this._eventName.set("value",""),this._component.set("value","0"),this._eduLevel.set("value","0"),this._crud.set("value","0"),this._table.set("data",this.get("tabledata"))}},{NAME:"eventFilter",ATTRS:{tabledata:{value:null}}}),g.namespace("M.report_eventlist.EventFilter").init=function(e){return new t(e)}},"@VERSION@",{requires:["base","event","node","node-event-delegate","datatable","autocomplete","autocomplete-filters"]});
\ No newline at end of file
+YUI.add("moodle-report_eventlist-eventfilter",function(g,e){function t(){t.superclass.constructor.apply(this,arguments)}var l="#id_eventname",n="#id_eventcomponent",i="#id_eventedulevel",a="#id_eventcrud",r="#id_filterbutton",s="#id_clearbutton";g.extend(t,g.Base,{_table:null,_eventName:null,_component:null,_eduLevel:null,_crud:null,initializer:function(){var e=g.one(r),t=g.one(s);this._createTable(this.get("tabledata")),this._eventName=g.one(l),this._component=g.one(n),this._eduLevel=g.one(i),this._crud=g.one(a),this._eventName.on("valuechange",this._totalFilter,this),e.on("click",this._totalFilter,this),t.on("click",this._clearFilter,this)},_createTable:function(e){var t=new g.DataTable({columns:[{key:"fulleventname",label:M.util.get_string("eventname","report_eventlist"),allowHTML:!0,sortable:!0,sortFn:function(e,t,l){var n=e.getAttrs().raweventname,i=t.getAttrs().raweventname<n?1:-1;return l?-i:i},title:M.util.get_string("eventname","report_eventlist")},{key:"component",label:M.util.get_string("component","report_eventlist"),allowHTML:!0,sortable:!0,title:M.util.get_string("component","report_eventlist")},{key:"edulevel",label:M.util.get_string("edulevel","report_eventlist"),sortable:!0,title:M.util.get_string("edulevel","report_eventlist")},{key:"crud",label:M.util.get_string("crud","report_eventlist"),sortable:!0,title:M.util.get_string("crud","report_eventlist")},{key:"objecttable",label:M.util.get_string("affectedtable","report_eventlist"),sortable:!0,title:M.util.get_string("affectedtable","report_eventlist")},{key:"since",label:M.util.get_string("since","report_eventlist"),sortable:!0,title:M.util.get_string("since","report_eventlist")},{key:"legacyevent",label:M.util.get_string("legacyevent","report_eventlist"),sortable:!0,title:M.util.get_string("legacyevent","report_eventlist")}],data:e,strings:{sortBy:"{title}",reverseSortBy:"{title}"}});return t.render("#report-eventlist-table"),t.get("boundingBox").addClass("report-eventlist-datatable-table"),this._table=t,this},_totalFilter:function(){var e,t,l,n,i,a,r=this._eventName.get("value").toLowerCase(),s=this._component.get("value"),o=this._eduLevel.get("options").item(this._eduLevel.get("selectedIndex")).get("text").toLowerCase(),u=this._eduLevel.get("value"),v=this._crud.get("options").item(this._crud.get("selectedIndex")).get("text").toLowerCase(),_=this._crud.get("value"),d=[];for(e=0;e<this.get("tabledata").length;e++)l=0<=(t=g.Node.create(this.get("tabledata")[e].fulleventname).get("text")).toLowerCase().indexOf(r),n=0<=t.toLowerCase().indexOf("\\"+s+"\\event\\"),i=0<=this.get("tabledata")[e].edulevel.toLowerCase().indexOf(o),a=0<=this.get("tabledata")[e].crud.toLowerCase().indexOf(v),""===r&&(l=!0),"0"===s&&(n=!0),"0"===u&&(i=!0),"0"===_&&(a=!0),l&&n&&i&&a&&d.push(this.get("tabledata")[e]);this._table.set("data",d)},_clearFilter:function(){this._eventName.set("value",""),this._component.set("value","0"),this._eduLevel.set("value","0"),this._crud.set("value","0"),this._table.set("data",this.get("tabledata"))}},{NAME:"eventFilter",ATTRS:{tabledata:{value:null}}}),g.namespace("M.report_eventlist.EventFilter").init=function(e){return new t(e)}},"@VERSION@",{requires:["base","event","node","node-event-delegate","datatable","autocomplete","autocomplete-filters"]});
\ No newline at end of file
diff --git a/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter.js b/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter.js
index 34cc92a6a4b..617edac493c 100644
--- a/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter.js
+++ b/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter.js
@@ -181,8 +181,6 @@ Y.extend(EventFilter, Y.Base, {
     _totalFilter: function() {
         // Get all of the details of the filter elements
         var eventNameFilter = this._eventName.get('value').toLowerCase(),
-            // Component selected text.
-            componentFilter = this._component.get('options').item(this._component.get('selectedIndex')).get('text').toLowerCase(),
             // Component selected value.
             componentValue = this._component.get('value'),
             // Education level selected text.
@@ -201,7 +199,7 @@ Y.extend(EventFilter, Y.Base, {
             // These variables will either be false or true depending on the statement outcome.
             var fullEventText = Y.Node.create(this.get('tabledata')[i].fulleventname).get('text'),
                 eventNameValue = fullEventText.toLowerCase().indexOf(eventNameFilter) >= 0,
-                componentFilterValue = this.get('tabledata')[i].component.toLowerCase().indexOf(componentFilter) >= 0,
+                componentFilterValue = fullEventText.toLowerCase().indexOf('\\' + componentValue + '\\event\\') >= 0,
                 eduLevelFilterValue = this.get('tabledata')[i].edulevel.toLowerCase().indexOf(eduLevelFilter) >= 0,
                 crudFilterValue = this.get('tabledata')[i].crud.toLowerCase().indexOf(crudFilter) >= 0;
             // If the name field is empty then add to the filter.
diff --git a/report/eventlist/yui/src/eventfilter/js/eventfilter.js b/report/eventlist/yui/src/eventfilter/js/eventfilter.js
index 771b2669481..adf481b9140 100644
--- a/report/eventlist/yui/src/eventfilter/js/eventfilter.js
+++ b/report/eventlist/yui/src/eventfilter/js/eventfilter.js
@@ -179,8 +179,6 @@ Y.extend(EventFilter, Y.Base, {
     _totalFilter: function() {
         // Get all of the details of the filter elements
         var eventNameFilter = this._eventName.get('value').toLowerCase(),
-            // Component selected text.
-            componentFilter = this._component.get('options').item(this._component.get('selectedIndex')).get('text').toLowerCase(),
             // Component selected value.
             componentValue = this._component.get('value'),
             // Education level selected text.
@@ -199,7 +197,7 @@ Y.extend(EventFilter, Y.Base, {
             // These variables will either be false or true depending on the statement outcome.
             var fullEventText = Y.Node.create(this.get('tabledata')[i].fulleventname).get('text'),
                 eventNameValue = fullEventText.toLowerCase().indexOf(eventNameFilter) >= 0,
-                componentFilterValue = this.get('tabledata')[i].component.toLowerCase().indexOf(componentFilter) >= 0,
+                componentFilterValue = fullEventText.toLowerCase().indexOf('\\' + componentValue + '\\event\\') >= 0,
                 eduLevelFilterValue = this.get('tabledata')[i].edulevel.toLowerCase().indexOf(eduLevelFilter) >= 0,
                 crudFilterValue = this.get('tabledata')[i].crud.toLowerCase().indexOf(crudFilter) >= 0;
             // If the name field is empty then add to the filter.
diff --git a/theme/boost/tests/behat/primarynav.feature b/theme/boost/tests/behat/primarynav.feature
new file mode 100644
index 00000000000..d4a03a26ec7
--- /dev/null
+++ b/theme/boost/tests/behat/primarynav.feature
@@ -0,0 +1,45 @@
+@javascript @theme_boost
+Feature: Primary navigation
+  To navigate in boost theme
+  As a user
+  I need to use the primary navigation
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email             |
+      | user1    | User      | One      | user1@example.com |
+
+  @javascript @theme_boost
+  Scenario Outline: Admin sets defaulthomepage to 0,1 and verify the landing page and site home link
+    Given I log in as "admin"
+    And the following config values are set as admin:
+      | defaulthomepage | <defaulthomepageset> |
+    And I am on homepage
+    And I should see "<homepage>" in the "//a[contains(@class,'nav-link active') and contains(., '<homepage>')]" "xpath_element"
+    And I should see "<sitehome>" in the "<linkelement>" "xpath_element"
+
+    Examples:
+      | defaulthomepageset | homepage    |  sitehome  |   linkelement                                                                                               |
+      |   0                | Home        |   Home     |  //a[contains(@class, 'nav-link active') and contains(@tabindex, 0) and not(contains(@href, 'redirect=0'))] |
+      |   1                | Dashboard   |  Site home |  //a[contains(@class, 'nav-link') and contains(@tabindex, -1) and (contains(@href, 'redirect=0'))]          |
+
+  @javascript @theme_boost
+  Scenario Outline: Admin sets defaulthomepage to 2 and verify the landing page based on user preference set
+    Given I log in as "admin"
+    And I navigate to "Appearance > Navigation" in site administration
+    And I set the field "Home page for users" to "User preference"
+    And I press "Save changes"
+    And I follow "Preferences" in the user menu
+    And I follow "Home page"
+    And I set the field "Home page" to "<userpreference>"
+    And I press "Save changes"
+    And the following config values are set as admin:
+      | defaulthomepage | 2 |
+    And I log out
+    And I log in as "admin"
+    And I should see "<homepage>" in the "//a[contains(@class,'nav-link active') and contains(., '<homepage>')]" "xpath_element"
+
+    Examples:
+      | userpreference | homepage    |
+      |   Site         | Home        |
+      |   Dashboard    | Dashboard   |
diff --git a/user/tests/behat/set_default_homepage.feature b/user/tests/behat/set_default_homepage.feature
index 8c5ec2c5232..917a007810f 100644
--- a/user/tests/behat/set_default_homepage.feature
+++ b/user/tests/behat/set_default_homepage.feature
@@ -71,38 +71,3 @@ Feature: Set the site home page and dashboard as the default home page
       | preference | breadcrumb |
       | Site       | Home       |
       | Dashboard  | Dashboard  |
-
-  @javascript @theme_boost
-  Scenario Outline: Admin sets defaulthomepage to 0,1 and verify the landing page and site home link
-    Given I log in as "admin"
-    And the following config values are set as admin:
-      | defaulthomepage | <defaulthomepageset> |
-    And I am on homepage
-    And I should see "<homepage>" in the "//a[contains(@class,'nav-link active') and contains(., '<homepage>')]" "xpath_element"
-    And I should see "<sitehome>" in the "<linkelement>" "xpath_element"
-
-    Examples:
-      | defaulthomepageset | homepage    |  sitehome  |   linkelement                                                                                               |
-      |   0                | Home        |   Home     |  //a[contains(@class, 'nav-link active') and contains(@tabindex, 0) and not(contains(@href, 'redirect=0'))] |
-      |   1                | Dashboard   |  Site home |  //a[contains(@class, 'nav-link') and contains(@tabindex, -1) and (contains(@href, 'redirect=0'))]          |
-
-  @javascript @theme_boost
-  Scenario Outline: Admin sets defaulthomepage to 2 and verify the landing page based on user preference set
-    Given I log in as "admin"
-    And I navigate to "Appearance > Navigation" in site administration
-    And I set the field "Home page for users" to "User preference"
-    And I press "Save changes"
-    And I follow "Preferences" in the user menu
-    And I follow "Home page"
-    And I set the field "Home page" to "<userpreference>"
-    And I press "Save changes"
-    And the following config values are set as admin:
-      | defaulthomepage | 2 |
-    And I log out
-    And I log in as "admin"
-    And I should see "<homepage>" in the "//a[contains(@class,'nav-link active') and contains(., '<homepage>')]" "xpath_element"
-
-    Examples:
-      | userpreference | homepage    |
-      |   Site         | Home        |
-      |   Dashboard    | Dashboard   |