Return the standard view instead of the map view
Merge remote-tracking branch 'origin/master' into FIELDS_DISCOVERY