diff --git a/app/assets/javascripts/darkswarm/directives/filter_selector.js.coffee b/app/assets/javascripts/darkswarm/directives/filter_selector.js.coffee
index c904a16b8d..5232906016 100644
--- a/app/assets/javascripts/darkswarm/directives/filter_selector.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/filter_selector.js.coffee
@@ -25,6 +25,9 @@ Darkswarm.directive "filterSelector",  (FilterSelectorsService)->
     scope.$on 'loadFilterSelectors', ->
       scope.allSelectors = scope.selectors()
 
+    scope.$watchCollection "selectors()", (newValue, oldValue) ->
+      scope.allSelectors = scope.selectors()
+
     # Build a list of selectors
     scope.selectors = ->
       # Generate a selector for each object.
diff --git a/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee b/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee
index c284adcd5c..ed756d8fde 100644
--- a/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee
+++ b/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee
@@ -62,8 +62,8 @@ Darkswarm.directive 'singleLineSelectors', ($timeout, $filter) ->
       if scope.allSelectors?
         scope.fitting = true
         selector.fits = true for selector in scope.allSelectors
-        loadWidths()
-        fit()
+        $timeout(loadWidths, 0, true).then ->
+          $timeout fit, 0, true
 
     $(window).resize debouncer (e) ->
       scope.fitting = true
diff --git a/app/views/shop/products/_filters.html.haml b/app/views/shop/products/_filters.html.haml
index 7e9fc6555d..90f6ff3121 100644
--- a/app/views/shop/products/_filters.html.haml
+++ b/app/views/shop/products/_filters.html.haml
@@ -1,5 +1,5 @@
 .filter-shopfront.taxon-selectors.animate-hide.text-right
-  %single-line-selectors{ objects: "Products.products | products:query | taxonsOf", "active-selectors" => "activeTaxons"}
+  %single-line-selectors{ objects: "Products.products | products:query | properties: activeProperties | taxonsOf", "active-selectors" => "activeTaxons"}
 
 .filter-shopfront.property-selectors.animate-hide.text-right
-  %single-line-selectors{ objects: "Products.products | products:query | propertiesOf", "active-selectors" => "activeProperties"}
+  %single-line-selectors{ objects: "Products.products | products:query | taxons:activeTaxons | propertiesOf", "active-selectors" => "activeProperties"}