What if you move the conditional into the UserSearcher, so that object will correctly handle queries and blank queries?