cleaned up advanced search