improved search - now highlights search user