Moving more search related code into Search app