some improvement to advanced search