Merge "Added query parameters for search"