Move Indicator type/agg controls to map partial