Fix AgeGroup
Refactor common residency methods
Symbolize SPR year category