Demo map facets labeling

The current demo map facets are "Location", "CountryLabel" and "Object type". The "Location" one can be a bit misleading in this context since the user may think primarily to the geographical location, and does not bring much value to this specific map. Could we consider removing it, what do you think? Also, renaming "CountryLabel" to "Country" and "Object type" to "Type" would enhance the experience.