Add option to disable searching of custom fields