diff --git a/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
index 7514d98705..33a4bd33bd 100644
--- a/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "EnterprisesCtrl", ($scope, Enterprises, Search, $document, $rootScope, HashNavigation, FilterSelectorsService, EnterpriseModal) ->
+Darkswarm.controller "EnterprisesCtrl", ($scope, Enterprises, Search, $document, $rootScope, HashNavigation, FilterSelectorsService, EnterpriseModal, visibleFilter, taxonsFilter, shippingFilter, showHubProfilesFilter, enterpriseMatchesNameQueryFilter) ->
   $scope.Enterprises = Enterprises
   $scope.totalActive = FilterSelectorsService.totalActive
   $scope.clearAll = FilterSelectorsService.clearAll
@@ -14,7 +14,19 @@ Darkswarm.controller "EnterprisesCtrl", ($scope, Enterprises, Search, $document,
   $scope.$watch "query", (query)->
     Enterprises.evaluateQuery query
     Search.search query
+    $scope.filterEnterprises()
+
 
   $rootScope.$on "$locationChangeSuccess", (newRoute, oldRoute) ->
     if HashNavigation.active "hubs"
       $document.scrollTo $("#hubs"), 100, 200
+
+
+  $scope.filterEnterprises = ->
+    es = Enterprises.hubs
+    es = visibleFilter(es)
+    es = taxonsFilter(es, $scope.activeTaxons)
+    es = shippingFilter(es, $scope.shippingTypes)
+    es = showHubProfilesFilter(es)
+    $scope.nameMatches = enterpriseMatchesNameQueryFilter(es, true)
+    $scope.distanceMatches = enterpriseMatchesNameQueryFilter(es, false)
diff --git a/app/views/home/_hubs.html.haml b/app/views/home/_hubs.html.haml
index 9fd6edfbae..dec5d6392b 100644
--- a/app/views/home/_hubs.html.haml
+++ b/app/views/home/_hubs.html.haml
@@ -11,7 +11,7 @@
   .row{bindonce: true}
     .small-12.columns
       %h2 Did you mean?
-      = render "home/hubs_table", filters: "visible | enterpriseMatchesNameQuery:true | taxons:activeTaxons | shipping:shippingTypes | showHubProfiles:show_profiles", order_by: "['-active', '+distance', '+orders_close_at']"
+      = render "home/hubs_table", enterprises: "nameMatches"
 
       %h2 Closest to {{ query }}...
-      = render "home/hubs_table", filters: "visible | enterpriseMatchesNameQuery:false | taxons:activeTaxons | shipping:shippingTypes | showHubProfiles:show_profiles", order_by: "['-active', '+distance', '+orders_close_at']"
+      = render "home/hubs_table", enterprises: "distanceMatches"
diff --git a/app/views/home/_hubs_table.html.haml b/app/views/home/_hubs_table.html.haml
index b23c418b00..e020480458 100644
--- a/app/views/home/_hubs_table.html.haml
+++ b/app/views/home/_hubs_table.html.haml
@@ -1,5 +1,5 @@
 .active_table
-  %hub.active_table_node.row.animate-repeat{"ng-repeat" => "hub in filteredEnterprises = (Enterprises.hubs | #{filters} | orderBy:#{order_by})",
+  %hub.active_table_node.row.animate-repeat{"ng-repeat" => "hub in filteredEnterprises = (#{enterprises} | orderBy:['-active', '+distance', '+orders_close_at'])",
   "ng-class" => "{'is_profile' : hub.category == 'hub_profile', 'closed' : !open(), 'open' : open(), 'inactive' : !hub.active, 'current' : current()}",
   "ng-controller" => "HubNodeCtrl",
   id: "{{hub.hash}}"}