issue #73 , #74 - update advanced search functionality