Fix indicator labels; use maps everywhere

Labels now display the descriptive name of
the indicator instead of the indicator code
name. Maps passed around everywhere now.