Reworked search interface