Clean up the design of the non-voice search