BZ-12084: Changes to show 'Whole facility measures' in the preview