--- a/cms/app-client/app/components/visu-carto.js	Sun Sep 25 13:45:54 2016 +0200
+++ b/cms/app-client/app/components/visu-carto.js	Sun Sep 25 14:02:11 2016 +0200
@@ -20,7 +20,7 @@
     filter: Ember.inject.service(),
     locationObserver: Ember.observer('filter.location', function() {
         if(!this.get('filter').get('location')) {
-            this.get('map').selectObject();
+            this.sendAction('setLocation', 'world');
         }
     }),
 
@@ -184,7 +184,7 @@
 
     homeButtonClicked: function(event) {
         if(event.chart.dataProvider.map !== 'continentsLow') {
-            this.sendAction('setLocation', 'world');
+            this.get('filter').set('location', null);
         }
     }