Make metrics toggle in maps
add additional metrics for maps
Merge branch 'opm-maps' into autostaging