Vinay | Make the search query specific to just what we need