diff --git a/app/controllers/web_resources_controller.rb b/app/controllers/web_resources_controller.rb
index 81c3202..1dd66c6 100644
--- a/app/controllers/web_resources_controller.rb
+++ b/app/controllers/web_resources_controller.rb
@@ -46,7 +46,10 @@ class WebResourcesController < ApplicationController
   end
 
   def widget
-    links = WebLink.where(:title.ne => "").can_display.filter_by_widget_categories
+    cats = OrbitHelper.widget_categories || []
+    tags = OrbitHelper.widget_tags || []
+    tags = ['all'] if tags.blank?
+    links = WebLink.where(:title.ne => "").can_display.filter_by_categories(cats, false).filter_by_tags(tags)
     web_link = links.collect do |link|
        statuses = link.statuses_with_classname.collect do |status|
         {