diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index b8548c7..2642c62 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -1,26 +1,11 @@
 class AnnouncementsController < ApplicationController
 
   def index
-    params = OrbitHelper.params
-    announcements = nil
-
-    if params[:tag]
-      !params[:sort].blank? ? sort = {params[:sort].to_sym=>params[:order]} : sort = {:postdate=>"desc"}
-      announcements = Bulletin.where(:title.ne => "" ,:is_preview.in=>[false,nil]).is_approved.order_by(sort).filter_by_categories(["all"]).filter_by_tags([params[:tag]])
+    if !OrbitHelper.widget_tags.blank?
+      announcements = Bulletin.where(:title.ne => "",:is_preview.in=>[false,nil]).can_display.is_approved.order_by(:postdate=>'desc').filter_by_tags(OrbitHelper.widget_tags).page(OrbitHelper.page_number).per(OrbitHelper.page_data_count)
     else
-      sort = ( !params[:sort].blank? ? {params[:sort].to_sym=>params[:order]} : {:postdate=>"desc"})
-
-      if OrbitHelper.page_categories.first == "all"
-      announcements = Bulletin.where(:title.ne => "",:is_preview.in=>[false,nil]).can_display.is_approved.order_by(sort).filter_by_tags.page(params[:page_no]).per(OrbitHelper.page_data_count)
-      else
-      announcements = Bulletin.where(:title.ne => "",:is_preview.in=>[false,nil]).can_display.is_approved.order_by(sort).filter_by_categories.filter_by_tags.page(params[:page_no]).per(OrbitHelper.page_data_count)
-      end
+      announcements = Bulletin.where(:title.ne => "",:is_preview.in=>[false,nil]).can_display.is_approved.order_by(:postdate=>'desc').filter_by_categories.filter_by_tags
     end
-    # if !OrbitHelper.params['tags'].blank?
-    #   announcements = Bulletin.where(:title.ne => "",:is_preview.in=>[false,nil]).can_display.is_approved.order_by(:postdate=>'desc').filter_by_tags(OrbitHelper.params['tags']).page(OrbitHelper.page_number).per(OrbitHelper.page_data_count)
-    # else
-    #   announcements = Bulletin.where(:title.ne => "",:is_preview.in=>[false,nil]).can_display.is_approved.order_by(:postdate=>'desc').filter_by_categories.filter_by_tags
-    # end
 
     anns = announcements.collect do |a|
       statuses = a.statuses_with_classname.collect do |status|