Finished the search

Now supports advanced search