Move map GET creation to controller