Added controls to search query