Better loading of search query from url