Question search refactoring