Fixed bug in national data tab
small change to aggregator method
merge