more bug fixing around preloading aggregation options
Merge branch 'ui/dev' into ui/topic/text-gadget