Improve search system (advanced search)