Improved advanced search.