Added advanced search (Not completely implemented)