diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
index 70e87e7e7..5df22d59b 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
@@ -86,8 +86,8 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
 
     private Listbox listZoomLevels;
 
-    private final String FILTER_RESOURCES = _("by resources");
-    private final String FILTER_CRITERIA = _("by criteria");
+    private final String FILTER_RESOURCES = _("Resources");
+    private final String FILTER_CRITERIA = _("Generic allocation criteria");
     private String feedBackMessage;
     private Boolean filterbyResources;
 
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index c8c5bc61c..436004528 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -40,17 +40,17 @@ resourcesLoadPanel = self;
         <separator/>
         <hbox id="additionalFilterInsertionPoint1" />
         <separator/>
-        ${ganttzk_i18n:_('Show')}:
-        <listbox id="listFilters" mold="select" rows="1" width="100px"
+        <label id="filterByNameLabel">${ganttzk_i18n:_('Page')}:</label>
+        <combobox id="filterByNameCombo" width="50px"
+            onChange="resourcesLoadPanel.onSelectFilterByName(self)" />
+        <separator/>
+        ${ganttzk_i18n:_('Group by')}:
+        <listbox id="listFilters" mold="select" rows="1" width="150px"
             model="${resourcesLoadPanel.filters}"
             selectedIndex="0"
             onSelect="resourcesLoadPanel.setFilter(self.selectedItem.value);">
         </listbox>
         <separator/>
-        <label id="filterByNameLabel">${ganttzk_i18n:_('Name filter')}:</label>
-        <combobox id="filterByNameCombo" width="50px"
-            onChange="resourcesLoadPanel.onSelectFilterByName(self)" />
-        <separator/>
         <hbox id="additionalFilterInsertionPoint2" />
        </hbox>
        </north>
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
index 2d490586b..5734ab57b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
@@ -427,8 +427,6 @@ public class ResourceLoadController implements Composer {
         }
 
         private Hbox buildTimeFilter() {
-            Label label1 = new Label(_("Time filter") + ":");
-            Label label2 = new Label("-");
             startBox.setValue(asDate(startDateValue));
             startBox.setWidth("100px");
             startBox.addEventListener(Events.ON_CHANGE, new EventListener() {
@@ -454,9 +452,9 @@ public class ResourceLoadController implements Composer {
                 }
             });
             Hbox hbox = new Hbox();
-            hbox.appendChild(label1);
+            hbox.appendChild(new Label(_("From") + ":"));
             hbox.appendChild(startBox);
-            hbox.appendChild(label2);
+            hbox.appendChild(new Label(_("To") + ":"));
             hbox.appendChild(endBox);
             hbox.setAlign("center");
             return hbox;
@@ -508,6 +506,8 @@ public class ResourceLoadController implements Composer {
 
         private final IResourcesSearcher resourcesSearcher;
 
+        private Label label = new Label();
+
         private WorkersOrCriteriaBandbox(Runnable onChange,
                 PlanningState filterBy, FilterTypeChanger filterType,
                 IResourcesSearcher resourcesSearcher) {
@@ -523,7 +523,7 @@ public class ResourceLoadController implements Composer {
             panel.setSecondOptionalFilter(buildBandboxFilterer());
         }
 
-        private BandboxMultipleSearch buildBandboxFilterer() {
+        private Hbox buildBandboxFilterer() {
             bandBox.setId("workerBandboxMultipleSearch");
             bandBox.setWidthBandbox("185px");
             bandBox.setWidthListbox("450px");
@@ -538,7 +538,25 @@ public class ResourceLoadController implements Composer {
                 }
             });
 
-            return bandBox;
+            Hbox hbox = new Hbox();
+            hbox.appendChild(getLabel());
+            hbox.appendChild(bandBox);
+            hbox.setAlign("center");
+
+            return hbox;
+        }
+
+        private Label getLabel() {
+            updateLabelValue();
+            return label;
+        }
+
+        private void updateLabelValue() {
+            if (isFilteringByResource()) {
+                label.setValue(_("Resources or criteria") + ":");
+            } else {
+                label.setValue(_("Criteria") + ":");
+            }
         }
 
         private String getFinderToUse() {
@@ -556,6 +574,7 @@ public class ResourceLoadController implements Composer {
             }
             entitiesSelected = null;
             bandBox.setFinder(getFinderToUse());
+            updateLabelValue();
         }
 
         @Override