MK-178 - made sure not to query twice for default and filtered aggregati...

...ons