Building combo search on top of query search