Stop relying on global constants for DB configuration
Fix incorrect entry in area list