Merge in IMOS hierarchical facets changes and update to use spring dependency injection

This pull request includes hierarchical facets merge and update to use spring dependency injection as previous pull request for hierarchical facets merge has not been merged.
If @anguss00 is OK with it I'll change it