PROV-901 Implement dictionary control in all bundles; fix sort by controls to co-exist nicely with dictionary control