Added ability to search different fields