diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/ui/DominoSelectBuilder.java b/www-client/src/main/java/fr/agrometinfo/www/client/ui/DominoSelectBuilder.java
index fdd5f050eda7427bf2ce10a78527b92ab63a6227..16847dd5d16cd7aa59704a135c45fb8a85c6a519 100644
--- a/www-client/src/main/java/fr/agrometinfo/www/client/ui/DominoSelectBuilder.java
+++ b/www-client/src/main/java/fr/agrometinfo/www/client/ui/DominoSelectBuilder.java
@@ -66,7 +66,7 @@ public final class DominoSelectBuilder<T> extends SelectBuilder<T, Select<T>> {
 
     @Override
     public DominoSelectBuilder<T> removeOptions() {
-        getSelect().getOptions().clear();
+        getSelect().removeAllOptions();
         return this;
     }
 
diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java b/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java
index cab741e22df1359ee9aaf191b7acce83e8dd70d2..c01b1b5f8f7cfb17c9513661d53953103d5c38b8 100644
--- a/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java
+++ b/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java
@@ -201,8 +201,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
      */
     @Override
     public void init() {
-        GWT.log("initLayout()");
-        DomGlobal.console.info("initLayout()");
+        GWT.log("LayoutView.initLayout()");
         choice.setLevel(FeatureLevel.REGION);
         layout = Layout.create("AgroMetInfo").show();
         layout.css("app-layout");
@@ -228,6 +227,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
     }
 
     private void initFooter() {
+        GWT.log("LayoutView.initFooter()");
         layout.showFooter();
         layout.fixFooter();
         appendFooterMenuItem(CSTS.about(), e -> this.notification("Not yet implemented"));
@@ -235,7 +235,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
     }
 
     private void initLeftPanel() {
-        GWT.log("initLeftPanel()");
+        GWT.log("LayoutView.initLeftPanel()");
         layout.fixLeftPanelPosition();
         layout.getLeftPanel().css("agrometinfo-leftsidebar");
         layout.setLeftPanelSize(Layout.LeftPanelSize.LARGE);
@@ -248,7 +248,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
         layout.getLeftPanel().setTransitionDuration("0");
 
         // https://demo.dominokit.org/forms/basic-form-elements?theme=blue
-        GWT.log("initLeftPanel() sumary");
+        GWT.log("LayoutView.initLeftPanel() sumary");
         final DominoElement<HTMLElement> panel = layout.getLeftPanel();
 
         panel.add(a() //
@@ -262,7 +262,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
         panel.appendChild(summary);
 
         //
-        GWT.log("initLeftPanel() periods");
+        GWT.log("LayoutView.initLeftPanel() periods");
         panel.appendChild(periodSelect);
         new DominoSelectBuilder<PeriodDTO>() //
         .setSelect(periodSelect) //
@@ -270,7 +270,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
         .build();
 
         //
-        GWT.log("initLeftPanel() indicators");
+        GWT.log("LayoutView.initLeftPanel() indicators");
         panel.appendChild(indicatorSelect);
         new DominoSelectBuilder<IndicatorDTO>() //
         .setSelect(indicatorSelect) //
@@ -278,7 +278,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
         .build();
 
         //
-        GWT.log("initLeftPanel() regions");
+        GWT.log("LayoutView.initLeftPanel() regions");
         panel.appendChild(regionSelect);
         new DominoSelectBuilder<Entry<String, String>>() //
         .setSelect(regionSelect) //
@@ -286,14 +286,14 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
         .build();
 
         //
-        GWT.log("initLeftPanel() year");
+        GWT.log("LayoutView.initLeftPanel() year");
         panel.appendChild(yearSelect);
         new DominoSelectBuilder<Entry<String, String>>() //
         .setSelect(yearSelect) //
         .addValueChangeHandler(this::onYearChange);
 
         //
-        GWT.log("initLeftPanel() comparison");
+        GWT.log("LayoutView.initLeftPanel() comparison");
         final SwitchButton comparisonBtn = SwitchButton.create(CSTS.normalComparison(), CSTS.no(), CSTS.yes()) //
                 .value(false);
         comparisonBtn.addChangeHandler(this::onComparisonChange);
@@ -311,6 +311,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
     }
 
     private void initMapView() {
+        GWT.log("LayoutView.initMapView()");
         // remove spaces
         layout.fitHeight();
         layout.fitWidth();
@@ -324,7 +325,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
     }
 
     private void initTopBar() {
-        GWT.log("initTopBar()");
+        GWT.log("LayoutView.initTopBar()");
 
         initUserDropMenu();
 
@@ -361,6 +362,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
     }
 
     private void initUserDropMenu() {
+        GWT.log("LayoutView.initUserDropMenu()");
         addMenuItem(userDropMenu, CSTS.userProfile(), Icons.ALL.settings_mdi(), () -> GWT.log("not implemented"));
         addMenuItem(userDropMenu, CSTS.logout(), Icons.ALL.exit_to_app_mdi(), () -> getPresenter().logout());
         addMenuItem(dotDropMenu, CSTS.userProfile(), Icons.ALL.settings_mdi(), () -> GWT.log("not implemented"));
@@ -391,11 +393,13 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
     }
 
     private void onIndicatorChange(final String newValue) {
+        GWT.log("LayoutView.onIndicatorChange() " + newValue);
         choice.setIndicator(newValue);
         onChoiceChange();
     }
 
     private void onPeriodChange(final String newValue) {
+        GWT.log("LayoutView.onPeriodChange() " + newValue);
         choice.setPeriod(newValue);
         choice.setIndicator(null);
 
@@ -407,13 +411,15 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
                 break;
             }
         }
-        if (list == null) {
+        if (list == null || list.isEmpty()) {
+            indicatorSelect.removeAllOptions();
             return;
         }
-        DomGlobal.console.info("Indicators : " + list);
+        GWT.log("LayoutView.onPeriodChange() Indicators : " + list);
+        final IndicatorDTO firstIndicator = list.get(0);
         final IndicatorDTO defaultIndicator = list.stream() //
                 .filter(i -> DEFAULT_INDICATOR.equals(i.getCode())) //
-                .findFirst().orElse(null);
+                .findFirst().orElse(firstIndicator);
         new DominoSelectBuilder<IndicatorDTO>() //
         .setSelect(indicatorSelect) //
         .setTextFunction(IndicatorDTO::getDescription) //
@@ -495,7 +501,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
             return;
         }
         // display periods
-        DomGlobal.console.info("Periods : " + list);
+        DomGlobal.console.info("LayoutView.setPeriods() : " + list);
         final PeriodDTO defaultPeriod = list.stream() //
                 .filter(i -> DEFAULT_PERIOD.equals(i.getCode())) //
                 .findFirst().orElse(null);
@@ -507,8 +513,6 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen
         .addOptions(list) //
         .select(defaultPeriod) //
         .build();
-        // select "year"
-        onPeriodChange(periodSelect.getValue().getCode());
     }
 
     @Override