diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java
index 77d50202d..fd56b5eae 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java
@@ -79,7 +79,6 @@ public class Interval {
     }
 
     public Fraction getProportion(DateTime date) {
-        Validate.isTrue(!date.isAfter(endExclusive.toDateTimeAtStartOfDay()));
         Days fromStartToDate = Days.daysBetween(startInclusive,
                 date.toLocalDate());
         Fraction fraction = Fraction.getFraction(fromStartToDate.getDays(),
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
index ca0e1a728..b90e1c02e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
@@ -36,8 +36,8 @@ import org.navalplanner.business.resources.daos.IResourceDAO;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.zkoss.ganttz.timetracker.TimeTracker;
-import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
 import org.zkoss.ganttz.timetracker.TimeTracker.IDetailItemFilter;
+import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
 import org.zkoss.ganttz.timetracker.zoom.DetailItem;
 import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
 import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
@@ -430,6 +430,7 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
         dependencyList.clear();
         queueListComponent.invalidate();
         queueListComponent.afterCompose();
+        queueListComponent.refreshQueues();
         rebuildDependencies();
     }
 
@@ -543,9 +544,10 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
                 }
             }
             horizontalPagination.setSelectedIndex(0);
-            if (horizontalPagination.getItems().size() < 2) {
-                horizontalPagination.setDisabled(true);
-            }
+
+            // Disable pagination if there's only one page
+            int size = horizontalPagination.getItems().size();
+            horizontalPagination.setDisabled(size == 1);
         }
 
         public void goToHorizontalPage(int interval) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java
index 6fbc24ed2..eefd6b083 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java
@@ -106,6 +106,12 @@ public class QueueListComponent extends HtmlMacroComponent implements
         queueComponent.removeQueueElement(element);
     }
 
+    public void refreshQueues() {
+        for (QueueComponent each: fromQueueToComponent.values()) {
+            each.invalidate();
+        }
+    }
+
     public void refreshQueue(LimitingResourceQueue queue) {
         QueueComponent queueComponent = fromQueueToComponent.get(queue);
         queueComponent.setLimitingResourceQueue(queue);
diff --git a/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul b/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
index 46e576554..b43bdb320 100644
--- a/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
+++ b/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
@@ -62,15 +62,17 @@
                     onSelect="limitingResourcesPanel.setZoomLevel(self.selectedItem.value);" >
                 </listbox>
 
-            <separator/>
-            <label>${i18n:_('Pagination')}:</label>
-            <button tooltiptext="${i18n:_('Page down')}" image="/common/img/ico_left.png" id="paginationDownButton"
-            onClick="limitingResourcesPanel.paginationDown();" disabled="true" />
-            <listbox mold="select" rows="1" visible="true" id="horizontalPagination"
-            onSelect="limitingResourcesPanel.goToSelectedHorizontalPage();" />
-            <button tooltiptext="${i18n:_('Page up')}" image="/common/img/ico_right.png" id="paginationUpButton"
-            onClick="limitingResourcesPanel.paginationUp();" />
+                <separator/>
 
+                <label>${i18n:_('Pagination')}:</label>
+                <button id="paginationDownButton" tooltiptext="${i18n:_('Page down')}" disabled="true"
+                        image="/common/img/ico_left.png"
+                        onClick="limitingResourcesPanel.paginationDown();" />
+                <listbox id="horizontalPagination" mold="select" rows="1" visible="true"
+                        onSelect="limitingResourcesPanel.goToSelectedHorizontalPage();" />
+                <button id="paginationUpButton" tooltiptext="${i18n:_('Page up')}"
+                        image="/common/img/ico_right.png"
+                        onClick="limitingResourcesPanel.paginationUp();" />
 
             </hbox>
         </north>