Added way to only search certain fields