Feature/advanced search

Closes #355 

Note: We'll need to configure some more search fields.