further revisions on advanced search