added search on fields