Refactor of adding ungrouped facets

Refactor of commit 04d8c1ccb992c2c5e994c71a07444fadb12f8760 - this
change set fixes issue where ungrouped facets could not be hidden via
“customise filters” drop down menu.