Fixed issues with JSON mapping for Week 5.