When loading a map, enforce a know data format. Refs #467, #554, #547 and #557.

* Simplified some code logic.
* Any additional data defined on the map, overrides the profile data.