PROV-1028 Make sure displays are properly type-restricted in search result options
Merge branch 'master-fix' into develop