added average to navigator and better handled dynamic aggregation