Small fixes in search query