PROV-525 Fixes for various field-level search issues