Added advanced search feature