Fixes for Question filter on Production
Merge pull request #240 from AndreiH/fix_questions_filter_prod

Fixes for new Question filter on Production