Search updated

Single search function. Does all relevant fields.