Added advanced search option feature and other things