simplify and generalise map-report