added option to specify fields to search on