modified search_question return type
Merge remote-tracking branch 'origin/master'