diff --git a/app/templates/orbit_bootstrap/modules/announcement/show.html.erb b/app/templates/orbit_bootstrap/modules/announcement/show.html.erb
index b80b931..243dad3 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/show.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/show.html.erb
@@ -1,6 +1,6 @@
 <article class="show" module="announcement">
   <div class="post-title">
-    <h1>Laboris eu eu consectetur amet adipisicing in velit non aliquip.</h1>
+    <h1>{{title}}</h1>
   </div>
   <small class="post-meta-date">
     <span>
@@ -14,11 +14,8 @@
     <span class="date">2014-03-07 19:24:37</span>
   </small>
   <section class="post">
-    <p class="pic"><img src="http://placehold.it/360x300" alt=""></p>
-    <p>Irure anim consequat culpa laboris ad sunt eiusmod. Ullamco in labore dolore proident dolore cillum aliquip officia irure id do. Adipisicing sint cupidatat et fugiat officia id officia exercitation.</p>
-    <p>Labore eiusmod Lorem duis amet ut qui cupidatat duis cupidatat. Amet aliquip consequat adipisicing exercitation irure commodo eu ullamco nisi eu. In ut commodo officia ut fugiat labore laborum Lorem exercitation exercitation ex cupidatat in. Fugiat laborum est culpa ullamco. Minim nostrud proident est ad laborum do eiusmod consectetur deserunt magna nostrud incididunt.</p>
-    <p>Deserunt eiusmod aliqua deserunt aliqua. Dolor tempor ex proident excepteur consectetur aute ad ut Lorem amet. Lorem sunt enim labore cupidatat consequat velit laborum exercitation qui quis laborum Lorem. Do officia ut mollit dolore consectetur quis ipsum. Amet qui consectetur culpa ipsum voluptate labore occaecat enim mollit aliqua laborum sit. Elit sunt ut in est cillum officia nisi irure magna sunt.</p>
-    <p>Voluptate quis velit ea voluptate anim magna ipsum non. Irure do qui nisi ut sunt mollit eiusmod laboris ullamco. Id enim voluptate dolor id id commodo ut ipsum dolore eiusmod commodo nulla laborum laborum. Laborum eiusmod quis id sit. Velit tempor elit nisi eiusmod ipsum fugiat consequat elit proident id. Anim id incididunt voluptate ea pariatur.</p>
+    <p class="pic"><img src="{{image}}" alt=""></p>
+    <p>{{body}}</p>
   </section>
   <div class="post-related">
     asdf
diff --git a/built_in_extensions.rb b/built_in_extensions.rb
index f527df2..780c111 100644
--- a/built_in_extensions.rb
+++ b/built_in_extensions.rb
@@ -1,3 +1,3 @@
 gem 'announcement', git: 'git@gitlab.tp.rulingcom.com:saurabh/announcement-test.git'
-gem 'ad_banner', path: '/Volumes/MyData/github/Orbit4.5/ad_banner/adbanner-test'
-gem 'gallery', path: '/Volumes/MyData/github/Orbit4.5/gallery'
\ No newline at end of file
+gem 'ad_banner', git: 'git@gitlab.tp.rulingcom.com:saurabh/adbanner-test.git'
+gem 'gallery', git: 'git@gitlab.tp.rulingcom.com:saurabh/gallery.git'
\ No newline at end of file
diff --git a/lib/orbit_category/categorizable.rb b/lib/orbit_category/categorizable.rb
index 7016145..e8c5dac 100644
--- a/lib/orbit_category/categorizable.rb
+++ b/lib/orbit_category/categorizable.rb
@@ -3,12 +3,10 @@ module OrbitCategory
     def self.included(base)
       base.extend ClassMethods
       base.field :category_id, type: BSON::ObjectId
-      base.class_eval "filter_by_categories"
     end
 
     module ClassMethods
        def filter_by_categories(categories=[])
-        class_eval do
           categories = OrbitHelper.page_categories if categories.blank?
           if !categories.blank?
             if categories.first == "all"
@@ -27,6 +25,13 @@ module OrbitCategory
           else
             []
           end
+      end
+
+       def with_categories(categories=[])
+        if categories.blank?
+          self.all
+        else
+          self.where(:category_id.in => categories)
         end
       end
     end
diff --git a/lib/orbit_tag/taggable.rb b/lib/orbit_tag/taggable.rb
index 72085a0..a2a7dda 100644
--- a/lib/orbit_tag/taggable.rb
+++ b/lib/orbit_tag/taggable.rb
@@ -4,6 +4,22 @@ module OrbitTag
     def self.included(base)
       base.has_many :taggings, as: :taggable, autosave: true, dependent: :destroy
       base.accepts_nested_attributes_for :taggings, allow_destroy: true
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def with_tags(tags=[])
+        tags = [tags].flatten.uniq
+        result = []
+        if tags.blank?
+          self.all
+        else
+          self.all.each do |taggable|
+            result << taggable if (taggable.taggings.map{|t| t.tag.id.to_s } & tags).size > 0
+          end
+          self.where(:id.in=>result.map{|taggable| taggable.id})
+        end
+      end
     end
 
     def tags
@@ -18,5 +34,9 @@ module OrbitTag
       end
     end
 
+    def tag_ids
+      self.taggings.blank? ? [] : self.taggings.map{|t| t.tag.id}.compact
+    end
+
   end
 end
\ No newline at end of file