Incorporating new query string structure for search