diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index 00775e3..83341cf 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -1,7 +1,11 @@
 class AnnouncementsController < ApplicationController
 
   def index
-    announcements = Bulletin.where(:title.ne => "",:is_preview.in=>[false,nil]).can_display.is_approved.order_by(:postdate=>'desc').filter_by_categories.filter_by_tags(OrbitHelper.params['tags'])
+    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|