diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index e7342cd5..710fd195 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -19,7 +19,7 @@ class CategoriesController < ApplicationController
     @years.delete(@year)
     @school_category = school_categories.in(@year).first
     @child_school_categories = SchoolCategory.for_parent_category(@school, @category).in(@year).valid
-    @questions = @category.questions
+    @questions = @category.questions.created_in(@year)
   end
 
   # GET /categories/new
diff --git a/app/models/question.rb b/app/models/question.rb
index a3badb8f..2798cf84 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -22,6 +22,7 @@ class Question < ApplicationRecord
   validates :option5, presence: true
 
   scope :for_category, -> (category) { where(category: category) }
+  scope :created_in, -> (year) { where('extract(year from questions.created_at) = ?', year) }
 
   enum target_group: [:unknown, :for_students, :for_teachers, :for_parents]
 
diff --git a/lib/tasks/data.rake b/lib/tasks/data.rake
index d20807af..3f3aa2a6 100644
--- a/lib/tasks/data.rake
+++ b/lib/tasks/data.rake
@@ -5,6 +5,8 @@
 # rails c -> SchoolCategory.update_all(year: '2017')
 # rake data:load_questions_csv; rake data:load_responses
 
+# sudo heroku run rake db:migrate -a mciea-beta
+# sudo heroku run console -a mciea-beta
 # sudo heroku run rake data:load_questions_csv -a mciea-beta
 # sudo heroku run:detached rake data:load_responses -a mciea-beta --size performance-l