Changed some AREA_CHOICES (Ticket #230)