Improved search, and shifted search to own service