Fixes for Question filter on Production