Search Options Integrated

The separate search functions have been integrated to one 'advanced'
search function.