Load countries and states when needed rather than in the constructor. Closes #4158