Regular search and rounded search are diverging. Turning them into separate components.