unified search fields and added user search