diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
index cf2122ef4..29450c536 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
@@ -30,6 +30,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.Map.Entry;
 
 import org.apache.commons.lang.Validate;
 import org.joda.time.LocalDate;
@@ -240,13 +241,10 @@ public class TaskElementAdapter implements ITaskElementAdapter {
             if (daysMap.isEmpty()) {
                 return null;
             }
-
-            for (LocalDate day : daysMap.keySet()) {
-                lastDay = day;
-                hoursLastDay = daysMap.get(day);
-
+            for (Entry<LocalDate, Integer> entry : daysMap.entrySet()) {
+                lastDay = entry.getKey();
+                hoursLastDay = entry.getValue();
                 count += hoursLastDay;
-
                 if (count >= hours) {
                     limitReached = true;
                     break;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
index 940526225..144734e73 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.SortedMap;
 import java.util.TreeMap;
+import java.util.Map.Entry;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -284,21 +285,19 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
     protected SortedMap<LocalDate, Integer> groupByWeek(
             SortedMap<LocalDate, Integer> map) {
         SortedMap<LocalDate, Integer> result = new TreeMap<LocalDate, Integer>();
-
-        for (LocalDate day : map.keySet()) {
+        for (Entry<LocalDate, Integer> entry : map.entrySet()) {
+            LocalDate day = entry.getKey();
             LocalDate key = getThursdayOfThisWeek(day);
-
+            Integer hours = entry.getValue() == null ? 0 : entry.getValue();
             if (result.get(key) == null) {
-                result.put(key, map.get(day));
+                result.put(key, hours);
             } else {
-                result.put(key, result.get(key) + map.get(day));
+                result.put(key, result.get(key) + hours);
             }
         }
-
         for (LocalDate day : result.keySet()) {
             result.put(day, result.get(day) / 7);
         }
-
         return result;
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
index 0f20c151e..8b8bccbcd 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
@@ -21,9 +21,10 @@
 package org.navalplanner.web.resources.search;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.Map.Entry;
 
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.CriterionType;
@@ -216,12 +217,12 @@ public class WorkerSearchController extends GenericForwardComposer {
      * @return
      */
     public TreeModel getCriterions() {
-        HashMap<CriterionType, Set<Criterion>> criterions = workerSearchModel
+        Map<CriterionType, Set<Criterion>> criterions = workerSearchModel
                 .getCriterions();
 
         List<CriterionTreeNode> rootList = new ArrayList<CriterionTreeNode>();
-        for (CriterionType key : criterions.keySet()) {
-            rootList.add(asNode(key, criterions.get(key)));
+        for (Entry<CriterionType, Set<Criterion>> entry : criterions.entrySet()) {
+            rootList.add(asNode(entry.getKey(), entry.getValue()));
         }
         CriterionTreeNode root = new CriterionTreeNode("Root", rootList);
         return new SimpleTreeModel(root);