diff --git a/db/migrate/20150917102718_add_extra_counters_to_tags.rb b/db/migrate/20150917102718_add_extra_counters_to_tags.rb
new file mode 100644
index 000000000..974784772
--- /dev/null
+++ b/db/migrate/20150917102718_add_extra_counters_to_tags.rb
@@ -0,0 +1,8 @@
+class AddExtraCountersToTags < ActiveRecord::Migration
+  def change
+    add_column :tags, :debates_count, :integer, default: 0
+    add_column :tags, :proposals_count, :integer, default: 0
+    add_index :tags, :debates_count
+    add_index :tags, :proposals_count
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 395b773f6..741f82940 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150914191003) do
+ActiveRecord::Schema.define(version: 20150917102718) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -253,12 +253,16 @@ ActiveRecord::Schema.define(version: 20150914191003) do
   add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
 
   create_table "tags", force: :cascade do |t|
-    t.string  "name",           limit: 40
-    t.integer "taggings_count",            default: 0
-    t.boolean "featured",                  default: false
+    t.string  "name",            limit: 40
+    t.integer "taggings_count",             default: 0
+    t.boolean "featured",                   default: false
+    t.integer "debates_count",              default: 0
+    t.integer "proposals_count",            default: 0
   end
 
+  add_index "tags", ["debates_count"], name: "index_tags_on_debates_count", using: :btree
   add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
+  add_index "tags", ["proposals_count"], name: "index_tags_on_proposals_count", using: :btree
 
   create_table "users", force: :cascade do |t|
     t.string   "email",                               default: "",    null: false