Fixes facets in set pages.

Closes #465. Closes #465

app/helpers/collections_helper.rb

@@ -70,7 +70,12 @@ def link_to_next_document(next_document)
   # TODO: Improve me.
   def catalog_index_path(*args)
     if params[:controller] == "sets"
-      return sets_path(*(args << {:set => params[:set]}))
+      if args.last.kind_of?(Hash)
+        args.last.merge!({:set => params[:set]})
+      else
+        args << {:set => params[:set]}
+      end
+      return sets_path(*(args))
     end
     super
   end

spec/features/sets_spec.rb

@@ -113,6 +113,16 @@
             expect(page).to have_content("Oregon State University")
           end
         end
+        context "and a facet is clicked" do
+          before do
+            click_link "Test Facet"
+          end
+          it "should stay in set context" do
+            within("#footer .contact") do
+              expect(page).to have_content("Oregon State University")
+            end
+          end
+        end
         context "and start over is clicked", :js => true do
           before do
             find("#startOverLink").click