Extracted map(...) into a reporting util class and some common cohorts and dimensions into library classes
Fixed some indicator values being rendered as missing (-) instead of null