diff --git a/api/src/main/java/org/openmrs/module/amrsmobileforms/DeleteSpacesInPatiendIdTask.java b/api/src/main/java/org/openmrs/module/amrsmobileforms/DeleteSpacesInPatiendIdTask.java
new file mode 100644
index 0000000..f3e682c
--- /dev/null
+++ b/api/src/main/java/org/openmrs/module/amrsmobileforms/DeleteSpacesInPatiendIdTask.java
@@ -0,0 +1,58 @@
+package org.openmrs.module.amrsmobileforms;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.openmrs.api.APIException;
+import org.openmrs.api.context.Context;
+import org.openmrs.module.amrsmobileforms.groovy.CleanPatientIdentifiers;
+import org.openmrs.module.amrsmobileforms.util.MobileFormEntryUtil;
+import org.openmrs.scheduler.tasks.AbstractTask;
+
+/**
+ * A task to clean up patient identifier prior to processing.
+ * 
+ *
+ */
+public class DeleteSpacesInPatiendIdTask extends AbstractTask {
+
+	private static Log log = LogFactory.getLog(DeleteSpacesInPatiendIdTask.class);
+    String filePath = MobileFormEntryUtil.getMobileFormsDropDir().getAbsolutePath();
+    private CleanPatientIdentifiers cleanPatientIdentifiers;
+
+    public CleanPatientIdentifiers getCleanPatientIdentifiers() {
+        return cleanPatientIdentifiers;
+    }
+
+    public void setCleanPatientIdentifiers(CleanPatientIdentifiers cleanPatientIdentifiers) {
+        this.cleanPatientIdentifiers = cleanPatientIdentifiers;
+    }
+
+    /**
+	 * Call Groovy class that cleans patient identifiers
+	 */
+	public void execute() {
+		Context.openSession();
+		log.debug("Running task that cleans Patient Identifier prior to form processing ");
+		try {
+			if (Context.isAuthenticated() == false)
+				authenticate();
+            //It would be good if we pass the full URL to path of the directory with forms to be processed
+            cleanPatientIdentifiers.getDirFileListing(filePath);
+		} catch (APIException e) {
+			log.error("Error running mobile forms relationships task", e);
+			throw e;
+		} finally {
+			Context.closeSession();
+		}
+	}
+
+	/*
+	 * Resources clean up
+	 */
+	public void shutdown() {
+		super.shutdown();
+		log.debug("Shutting down task that cleans Patient Identifier");
+	}
+
+
+}
\ No newline at end of file
diff --git a/api/src/main/java/org/openmrs/module/amrsmobileforms/groovy/CleanPatientIdentifiers.java b/api/src/main/java/org/openmrs/module/amrsmobileforms/groovy/CleanPatientIdentifiers.java
new file mode 100644
index 0000000..1815444
--- /dev/null
+++ b/api/src/main/java/org/openmrs/module/amrsmobileforms/groovy/CleanPatientIdentifiers.java
@@ -0,0 +1,7 @@
+package org.openmrs.module.amrsmobileforms.groovy;
+
+/**
+ * TODO:please provide a brief description for the class.
+ */
+public interface CleanPatientIdentifiers {
+}
diff --git a/api/src/main/java/org/openmrs/module/amrsmobileforms/groovy/ParseXML.groovy b/api/src/main/java/org/openmrs/module/amrsmobileforms/groovy/ParseXML.groovy
new file mode 100644
index 0000000..d037d01
--- /dev/null
+++ b/api/src/main/java/org/openmrs/module/amrsmobileforms/groovy/ParseXML.groovy
@@ -0,0 +1,65 @@
+package org.openmrs.module.amrsmobileforms.groovy
+
+import groovy.xml.StreamingMarkupBuilder
+
+public class ParseXML{
+
+    def getDirFileListing(String pathToFolder){
+
+        new File(pathToFolder).eachFile() { file->
+
+            def fullFilePath = pathToFolder +"/" + file.getName()
+            def fileData = new XmlSlurper(false,false).parse(fullFilePath);
+
+            if(fileData==null){
+                //todo: handle blank files
+            }
+            else{
+
+
+                def individuals = fileData.household.individuals.individual
+
+                individuals.each{
+                    String patient_number = it.patient."patient.medical_record_number"
+                    patient_number = patient_number.toString()
+
+                    if(patient_number){
+
+                        patient_number.trim()
+
+                        String newNum =patient_number.replaceAll("\\s","")
+
+                        if(!patient_number.equals(newNum)){
+
+                            it.patient."patient.medical_record_number".replaceBody(newNum)
+
+                            def writable = new StreamingMarkupBuilder().bind { mkp.yield fileData }
+                            writable.writeTo(new PrintWriter(new FileWriter(fullFilePath)))
+
+
+                        }
+
+
+                    }
+                    else{
+
+                        //todo:add code to perfom any  task for such a scenario
+
+                    }
+
+                }
+
+
+            }
+
+
+        }
+
+
+
+    }
+
+
+}
+
+
diff --git a/api/src/main/resources/ParseXML.groovy b/api/src/main/resources/ParseXML.groovy
new file mode 100644
index 0000000..e69de29
diff --git a/omod/src/main/java/org/openmrs/module/amrsmobileforms/web/controller/ResolveErrorsController.java b/omod/src/main/java/org/openmrs/module/amrsmobileforms/web/controller/ResolveErrorsController.java
index 64a16d6..c9844a6 100644
--- a/omod/src/main/java/org/openmrs/module/amrsmobileforms/web/controller/ResolveErrorsController.java
+++ b/omod/src/main/java/org/openmrs/module/amrsmobileforms/web/controller/ResolveErrorsController.java
@@ -55,12 +55,141 @@ public class ResolveErrorsController {
 	/**
 	 * Controller for Error list jsp page
 	 */
-	@RequestMapping(value = "/module/amrsmobileforms/resolveErrors")
+	@RequestMapping(value = "/module/amrsmobileforms/resolveErrors",method = RequestMethod.GET)
 	public String showErrorList() {
 		return "/module/amrsmobileforms/resolveErrors";
 	}
-
-	/**
+    /*controller method used to resolve an error from resolveErrors dialog window*/
+    @RequestMapping(value = "/module/amrsmobileforms/resolveErrorsFromDialog")
+    public String resolveErrorfromDialog(HttpSession httpSession, @RequestParam("householdId") String householdId,
+                               @RequestParam("errorId") Integer errorId, @RequestParam("errorItemAction") String errorItemAction,
+                               @RequestParam("birthDate") String birthDate, @RequestParam("patientIdentifier") String patientIdentifier,
+                               @RequestParam("providerId") String providerId, @RequestParam("householdIdentifier") String householdIdentifier) {
+        MobileFormEntryService mobileService;
+        String filePath;
+
+        log.debug("Error ID is "+errorId);
+
+        // user must be authenticated (avoids authentication errors)
+        if (Context.isAuthenticated()) {
+            if (!Context.getAuthenticatedUser().hasPrivilege(
+                    MobileFormEntryConstants.PRIV_RESOLVE_MOBILE_FORM_ENTRY_ERROR)) {
+                httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "amrsmobileforms.action.noRights");
+                return "redirect:resolveErrors.list";
+            }
+
+            mobileService = Context.getService(MobileFormEntryService.class);
+
+            // fetch the MobileFormEntryError item from the database
+            MobileFormEntryError errorItem = mobileService.getErrorById(errorId);
+            filePath = MobileFormEntryUtil.getMobileFormsErrorDir().getAbsolutePath() + errorItem.getFormName();
+            if ("linkHousehold".equals(errorItemAction)) {
+                if (mobileService.getHousehold(householdId) == null) {
+                    httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "amrsmobileforms.resolveErrors.action.createLink.error");
+                    return "redirect:resolveErrors.list";
+                } else {
+                    if (XFormEditor.editNode(filePath,
+                            MobileFormEntryConstants.PATIENT_NODE + "/" + MobileFormEntryConstants.PATIENT_HOUSEHOLD_IDENTIFIER, householdId)) {
+                        // put form in queue for normal processing
+                        moveAndDeleteError(MobileFormEntryUtil.getMobileFormsQueueDir().getAbsolutePath(), errorItem);
+                    }
+                }
+            } else if ("assignBirthdate".equals(errorItemAction)) {
+                // format provided birthdate and insert into patient data like so:
+                // <patient.birthdate openmrs_table="patient" openmrs_attribute="birthdate">2009-12-25</patient.birthdate>
+                if (StringUtils.isNotEmpty(birthDate)) {
+                    DateFormat reader = DateFormat.getDateInstance(DateFormat.SHORT, Context.getLocale());
+                    DateFormat writer = new SimpleDateFormat("yyyy-MM-dd");
+                    try {
+                        String formattedDate = writer.format(reader.parse(birthDate));
+                        if (XFormEditor.editNode(filePath,
+                                MobileFormEntryConstants.PATIENT_NODE + "/" + MobileFormEntryConstants.PATIENT_BIRTHDATE, formattedDate)) {
+                            // put form in queue for normal processing
+                            moveAndDeleteError(MobileFormEntryUtil.getMobileFormsQueueDir().getAbsolutePath(), errorItem);
+                        }
+                    } catch (ParseException e) {
+                        String error = "Birthdate was not assigned, Invalid date entered: " + birthDate;
+                        httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, error);
+                        log.error(error, e);
+                        return "redirect:resolveErrors.list";
+                    }
+                } else {
+                    httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "Birthdate was not assigned, Null object entered");
+                    return "redirect:resolveErrors.list";
+                }
+            } else if ("newIdentifier".equals(errorItemAction)) {
+                if (patientIdentifier != null && patientIdentifier.trim() != "") {
+                    if (reverseNodes(filePath, patientIdentifier)) {
+                        // put form in queue for normal processing
+                        moveAndDeleteError(MobileFormEntryUtil.getMobileFormsQueueDir().getAbsolutePath(), errorItem);
+                    }
+                } else {
+                    httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "amrsmobileforms.resolveErrors.action.newIdentifier.error");
+                    return "redirect:resolveErrors.list";
+                }
+            } else if ("linkProvider".equals(errorItemAction)) {
+                if (providerId != null && providerId.trim() != "") {
+                    //providerId = Context.getUserService().getUser(Integer.parseInt(providerId)).getSystemId();
+                    if (XFormEditor.editNode(filePath,
+                            MobileFormEntryConstants.ENCOUNTER_NODE + "/" + MobileFormEntryConstants.ENCOUNTER_PROVIDER, providerId)) {
+                        // put form in queue for normal processing
+                        moveAndDeleteError(MobileFormEntryUtil.getMobileFormsQueueDir().getAbsolutePath(), errorItem);
+                    }
+                } else {
+                    httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "(Null) Invalid provider ID");
+                    return "redirect:resolveErrors.list";
+                }
+            } else if ("createPatient".equals(errorItemAction)) {
+                // put form in queue for normal processing
+                moveAndDeleteError(MobileFormEntryUtil.getMobileFormsQueueDir().getAbsolutePath(), errorItem);
+            } else if ("deleteError".equals(errorItemAction)) {
+                // delete the mobileformentry error queue item
+                mobileService.deleteError(errorItem);
+                //and delete from the file system
+                MobileFormEntryUtil.deleteFile(filePath);
+
+            } else if ("deleteComment".equals(errorItemAction)) {
+                //set comment to null and save
+                errorItem.setComment(null);
+                mobileService.saveErrorInDatabase(errorItem);
+            } else if ("newHousehold".equals(errorItemAction)) {
+                if (householdIdentifier != null && householdIdentifier.trim() != "") {
+                    // first change household id
+                    if (XFormEditor.editNode(filePath,
+                            MobileFormEntryConstants.HOUSEHOLD_PREFIX + MobileFormEntryConstants.HOUSEHOLD_META_PREFIX + "/"
+                                    + MobileFormEntryConstants.HOUSEHOLD_META_HOUSEHOLD_ID, householdIdentifier)) {
+                    } else {
+                        httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "Error assigning new household identififer");
+                        return "redirect:resolveErrors.list";
+                    }
+
+                    // then change all patient household pointers
+                    if (XFormEditor.editNodeList(filePath,
+                            MobileFormEntryConstants.HOUSEHOLD_PREFIX + MobileFormEntryConstants.HOUSEHOLD_INDIVIDUALS_PREFIX,
+                            "patient/" + MobileFormEntryConstants.PATIENT_HOUSEHOLD_IDENTIFIER, householdIdentifier)) {
+                        // drop form in queue for normal processing
+                        moveAndDeleteError(MobileFormEntryUtil.getMobileFormsDropDir().getAbsolutePath(), errorItem);
+                    } else {
+                        httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "Error assigning new household identififer");
+                        return "redirect:resolveErrors.list";
+                    }
+                } else {
+                    httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "Error assigning new household identififer");
+                    return "redirect:resolveErrors.list";
+                }
+            } else if ("noChange".equals(errorItemAction)) {
+                // do nothing here
+            } else {
+                throw new APIException("Invalid action selected for: " + errorId);
+            }
+        }
+
+        httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, "amrsmobileforms.resolveErrors.action.success");
+        return "redirect:resolveErrors.list";
+    }
+
+
+    /**
 	 * Controller for commentOnError jsp Page
 	 */
 	@ModelAttribute("errorFormComment")
@@ -96,136 +225,6 @@ public List<MobileFormEntryErrorModel> populateErrorForm(@RequestParam Integer e
 		return getErrorObject(errorId);
 	}
 
-	/**
-	 * Controller for resolveError post jsp Page
-	 */
-	@RequestMapping(value = "/module/amrsmobileforms/resolveError", method = RequestMethod.POST)
-	public String resolveError(HttpSession httpSession, @RequestParam("householdId") String householdId,
-		@RequestParam("errorId") Integer errorId, @RequestParam("errorItemAction") String errorItemAction,
-		@RequestParam("birthDate") String birthDate, @RequestParam("patientIdentifier") String patientIdentifier,
-		@RequestParam("providerId") String providerId, @RequestParam("householdIdentifier") String householdIdentifier) {
-		MobileFormEntryService mobileService;
-		String filePath;
-		
-		log.debug("Error ID is "+errorId);
-
-		// user must be authenticated (avoids authentication errors)
-		if (Context.isAuthenticated()) {
-			if (!Context.getAuthenticatedUser().hasPrivilege(
-				MobileFormEntryConstants.PRIV_RESOLVE_MOBILE_FORM_ENTRY_ERROR)) {
-				httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "amrsmobileforms.action.noRights");
-				return "redirect:resolveErrors.list";
-			}
-
-			mobileService = Context.getService(MobileFormEntryService.class);
-
-			// fetch the MobileFormEntryError item from the database
-			MobileFormEntryError errorItem = mobileService.getErrorById(errorId);
-			filePath = MobileFormEntryUtil.getMobileFormsErrorDir().getAbsolutePath() + errorItem.getFormName();
-			if ("linkHousehold".equals(errorItemAction)) {
-				if (mobileService.getHousehold(householdId) == null) {
-					httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "amrsmobileforms.resolveErrors.action.createLink.error");
-					return "redirect:resolveErrors.list";
-				} else {
-					if (XFormEditor.editNode(filePath,
-						MobileFormEntryConstants.PATIENT_NODE + "/" + MobileFormEntryConstants.PATIENT_HOUSEHOLD_IDENTIFIER, householdId)) {
-						// put form in queue for normal processing
-						moveAndDeleteError(MobileFormEntryUtil.getMobileFormsQueueDir().getAbsolutePath(), errorItem);
-					}
-				}
-			} else if ("assignBirthdate".equals(errorItemAction)) {
-				// format provided birthdate and insert into patient data like so:
-				// <patient.birthdate openmrs_table="patient" openmrs_attribute="birthdate">2009-12-25</patient.birthdate>
-				if (StringUtils.isNotEmpty(birthDate)) {
-					DateFormat reader = DateFormat.getDateInstance(DateFormat.SHORT, Context.getLocale());
-					DateFormat writer = new SimpleDateFormat("yyyy-MM-dd");
-					try {
-						String formattedDate = writer.format(reader.parse(birthDate));
-						if (XFormEditor.editNode(filePath,
-							MobileFormEntryConstants.PATIENT_NODE + "/" + MobileFormEntryConstants.PATIENT_BIRTHDATE, formattedDate)) {
-							// put form in queue for normal processing
-							moveAndDeleteError(MobileFormEntryUtil.getMobileFormsQueueDir().getAbsolutePath(), errorItem);
-						}
-					} catch (ParseException e) {
-						String error = "Birthdate was not assigned, Invalid date entered: " + birthDate;
-						httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, error);
-						log.error(error, e);
-						return "redirect:resolveErrors.list";
-					}
-				} else {
-					httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "Birthdate was not assigned, Null object entered");
-					return "redirect:resolveErrors.list";
-				}
-			} else if ("newIdentifier".equals(errorItemAction)) {
-				if (patientIdentifier != null && patientIdentifier.trim() != "") {
-					if (reverseNodes(filePath, patientIdentifier)) {
-						// put form in queue for normal processing
-						moveAndDeleteError(MobileFormEntryUtil.getMobileFormsQueueDir().getAbsolutePath(), errorItem);
-					}
-				} else {
-					httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "amrsmobileforms.resolveErrors.action.newIdentifier.error");
-					return "redirect:resolveErrors.list";
-				}
-			} else if ("linkProvider".equals(errorItemAction)) {
-				if (providerId != null && providerId.trim() != "") {
-					providerId = Context.getUserService().getUser(Integer.parseInt(providerId)).getSystemId();
-					if (XFormEditor.editNode(filePath,
-						MobileFormEntryConstants.ENCOUNTER_NODE + "/" + MobileFormEntryConstants.ENCOUNTER_PROVIDER, providerId)) {
-						// put form in queue for normal processing
-						moveAndDeleteError(MobileFormEntryUtil.getMobileFormsQueueDir().getAbsolutePath(), errorItem);
-					}
-				} else {
-					httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "(Null) Invalid provider ID");
-					return "redirect:resolveErrors.list";
-				}
-			} else if ("createPatient".equals(errorItemAction)) {
-				// put form in queue for normal processing
-				moveAndDeleteError(MobileFormEntryUtil.getMobileFormsQueueDir().getAbsolutePath(), errorItem);
-			} else if ("deleteError".equals(errorItemAction)) {
-				// delete the mobileformentry error queue item
-				mobileService.deleteError(errorItem);
-				//and delete from the file system
-				MobileFormEntryUtil.deleteFile(filePath);
-
-			} else if ("deleteComment".equals(errorItemAction)) {
-				//set comment to null and save
-				errorItem.setComment(null);
-				mobileService.saveErrorInDatabase(errorItem);
-			} else if ("newHousehold".equals(errorItemAction)) {
-				if (householdIdentifier != null && householdIdentifier.trim() != "") {
-					// first change household id
-					if (XFormEditor.editNode(filePath,
-						MobileFormEntryConstants.HOUSEHOLD_PREFIX + MobileFormEntryConstants.HOUSEHOLD_META_PREFIX + "/"
-						+ MobileFormEntryConstants.HOUSEHOLD_META_HOUSEHOLD_ID, householdIdentifier)) {
-					} else {
-						httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "Error assigning new household identififer");
-						return "redirect:resolveErrors.list";
-					}
-
-					// then change all patient household pointers
-					if (XFormEditor.editNodeList(filePath,
-						MobileFormEntryConstants.HOUSEHOLD_PREFIX + MobileFormEntryConstants.HOUSEHOLD_INDIVIDUALS_PREFIX,
-						"patient/" + MobileFormEntryConstants.PATIENT_HOUSEHOLD_IDENTIFIER, householdIdentifier)) {
-						// drop form in queue for normal processing
-						moveAndDeleteError(MobileFormEntryUtil.getMobileFormsDropDir().getAbsolutePath(), errorItem);
-					} else {
-						httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "Error assigning new household identififer");
-						return "redirect:resolveErrors.list";
-					}
-				} else {
-					httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "Error assigning new household identififer");
-					return "redirect:resolveErrors.list";
-				}
-			} else if ("noChange".equals(errorItemAction)) {
-				// do nothing here
-			} else {
-				throw new APIException("Invalid action selected for: " + errorId);
-			}
-		}
-
-		httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, "amrsmobileforms.resolveErrors.action.success");
-		return "redirect:resolveErrors.list";
-	}
 
 	/**
 	 * Given an id, this method creates an error model
@@ -290,17 +289,32 @@ private static String getAbsoluteFilePath(String formName, MobileFormEntryServic
 	/**
 	 * Stores a form in a specified folder
 	 */
-	private static void saveForm(String oldFormPath, String newFormPath) {
+	private static boolean saveForm(String oldFormPath, String newFormPath) {
+
 		try {
 			if (oldFormPath != null) {
 				File file = new File(oldFormPath);
+                File newDestination = new File(newFormPath);
 
 				//move the file to specified new directory
-				file.renameTo(new File(newFormPath));
+                /*check to see if the new file path exists. renameTo does nothing if same path is encountered*/
+                if(newDestination.exists())
+                    newDestination.deleteOnExit();//safely deletes the file.
+
+				if(file.renameTo(new File(newFormPath))){
+                   log.info("Moving error file to drop directory was successful");
+                   return true;
+                }
+                else {
+                    log.info("Failed to move file to drop directory");
+                    return false;
+                }
 			}
 		} catch (Exception e) {
+            e.printStackTrace();
 			log.error(e.getMessage(), e);
 		}
+        return false;
 
 	}
 
@@ -420,9 +434,14 @@ private void moveAndDeleteError(String destination, MobileFormEntryError error)
 		// find error location
 		String filePath = MobileFormEntryUtil.getMobileFormsErrorDir().getAbsolutePath() + error.getFormName();
 		// put form in queue for normal processing
-		saveForm(filePath, destination + error.getFormName());
-		// delete the mobileformentry error queue item
-		getMobileFormEntryService().deleteError(error);
+		if(saveForm(filePath, destination + error.getFormName())){
+            // delete the mobileformentry error queue item
+            getMobileFormEntryService().deleteError(error);
+        }
+        else{
+            log.error("Could not complete error resolution process");
+        }
+
 	}
 
 	/**
diff --git a/omod/src/main/resources/webModuleApplicationContext.xml b/omod/src/main/resources/webModuleApplicationContext.xml
index f7aa449..bb1e740 100644
--- a/omod/src/main/resources/webModuleApplicationContext.xml
+++ b/omod/src/main/resources/webModuleApplicationContext.xml
@@ -1,14 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:lang="http://www.springframework.org/schema/lang"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
  		    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/context
-  		    http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+            http://www.springframework.org/schema/context
+  		    http://www.springframework.org/schema/context/spring-context-3.0.xsd
+            http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
 
     <!-- Add here beans related to the web context -->
 
+    <!-- this is the bean definition for the Groovy-backed class implementation -->
+    <lang:groovy id="groovyScript" script-source="classpath:ParseXML.groovy"></lang:groovy>
+
+    <!-- an otherwise normal bean that will be injected by the Groovy-backed Messenger -->
+    <bean id="cleanPatientIdTask" class="org.openmrs.module.amrsmobileforms.DeleteSpacesInPatiendIdTask">
+        <property name="cleanPatientIdentifiers" ref="groovyScript" />
+    </bean>
 
     <!-- Annotation based controllers -->
     <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping"/>
diff --git a/omod/src/main/webapp/resolveError.jsp b/omod/src/main/webapp/resolveError.jsp
index 9981970..b24133b 100755
--- a/omod/src/main/webapp/resolveError.jsp
+++ b/omod/src/main/webapp/resolveError.jsp
@@ -1,4 +1,4 @@
-<%@ include file="/WEB-INF/template/include.jsp"%>
+ <%@ include file="/WEB-INF/template/include.jsp"%>
 
 <openmrs:require privilege="Resolve Mobile Form Entry Error" otherwise="/login.htm" redirect="/module/amrsmobileforms/resolveErrors.form" />
 
diff --git a/omod/src/main/webapp/resolveErrors.jsp b/omod/src/main/webapp/resolveErrors.jsp
index 73108c9..fd390de 100755
--- a/omod/src/main/webapp/resolveErrors.jsp
+++ b/omod/src/main/webapp/resolveErrors.jsp
@@ -1,606 +1,607 @@
 <%@ include file="/WEB-INF/template/include.jsp" %>
 
-<openmrs:require privilege="View Mobile Form Errors" otherwise="/login.htm" redirect="/module/amrsmobileforms/resolveErrors.list"/>
+<openmrs:require privilege="View Mobile Form Errors" otherwise="/login.htm"
+                 redirect="/module/amrsmobileforms/resolveErrors.list"/>
 
 <%@ include file="/WEB-INF/template/header.jsp" %>
-<%@ include file="localHeader.jsp"%>
+<%@ include file="localHeader.jsp" %>
 
-<openmrs:htmlInclude file="/scripts/calendar/calendar.js" />
-<openmrs:htmlInclude file="/scripts/dojoConfig.js" />
-<openmrs:htmlInclude file="/scripts/dojo/dojo.js" />
+<openmrs:htmlInclude file="/scripts/calendar/calendar.js"/>
+<openmrs:htmlInclude file="/scripts/dojoConfig.js"/>
+<openmrs:htmlInclude file="/scripts/dojo/dojo.js"/>
 
-<openmrs:htmlInclude file="/moduleResources/amrsmobileforms/js/jquery.dataTables.min.js" />
+<openmrs:htmlInclude file="/moduleResources/amrsmobileforms/js/jquery.dataTables.min.js"/>
 <openmrs:htmlInclude file="/dwr/interface/DWRAMRSMobileFormsService.js"/>
-<openmrs:htmlInclude file="/scripts/jquery/dataTables/css/dataTables.css" />
-<openmrs:htmlInclude file="/moduleResources/amrsmobileforms/css/smoothness/jquery-ui-1.8.16.custom.css" />
-<openmrs:htmlInclude file="/moduleResources/amrsmobileforms/css/dataTables_jui.css" />
+<openmrs:htmlInclude file="/scripts/jquery/dataTables/css/dataTables.css"/>
+<openmrs:htmlInclude file="/moduleResources/amrsmobileforms/css/smoothness/jquery-ui-1.8.16.custom.css"/>
+<openmrs:htmlInclude file="/moduleResources/amrsmobileforms/css/dataTables_jui.css"/>
 
 
 <h2><spring:message code="amrsmobileforms.resolveErrors.title"/></h2>
 <style type="text/css">
-	.tblformat tr:nth-child(odd) td {
-	  background-color: #eee;
-	}
-	
-	.tblformat tr:nth-child(odd) th {
-	  background-color: #ddd;
-	}
-	
-	.tblformat tr:nth-child(even) td {
-	  background-color: #d3d3d3;
-	}
-	
-	.tblformat tr:nth-child(even) th {
-	  background-color: #bbb;
-	}
+    .tblformat tr:nth-child(odd) td {
+        background-color: #eee;
+    }
+
+    .tblformat tr:nth-child(odd) th {
+        background-color: #ddd;
+    }
+
+    .tblformat tr:nth-child(even) td {
+        background-color: #d3d3d3;
+    }
+
+    .tblformat tr:nth-child(even) th {
+        background-color: #bbb;
+    }
 </style>
 <style type="text/css">
-	/* comment and resolve buttons */
-	button.action { border: 1px solid gray; font-size: .75em; color: black; width: 52px; margin: 2px; padding: 1px; cursor: pointer; }
-	button.resolve { background-color: #E0E0F0; }
-	button.comment { background-color: lightpink; }
-
-	/* error table */
-	#errors { margin: 1em; }
-	#errors table { width: 100%; }
-	#tools { margin: 1em; }
-	.centered { text-align: center; }
-
-	/* datatable stuff */
-	.dataTables_info { font-weight: normal; }
-	.dataTables_wrapper { padding-bottom: 0; }
-	.ui-widget-header { font-weight: inherit; }
-	.css_right { float: right; }
-	.css_left { float: left; }
-	.dataTables_length { width: auto; }
+        /* comment and resolve buttons */
+    button.action {
+        border: 1px solid gray;
+        font-size: .75em;
+        color: black;
+        width: 52px;
+        margin: 2px;
+        padding: 1px;
+        cursor: pointer;
+    }
+
+    button.resolve {
+        background-color: #E0E0F0;
+    }
+
+    button.comment {
+        background-color: lightpink;
+    }
+
+        /* error table */
+    #errors {
+        margin: 1em;
+    }
+
+    #errors table {
+        width: 100%;
+    }
+
+    #tools {
+        margin: 1em;
+    }
+
+    .centered {
+        text-align: center;
+    }
+
+        /* datatable stuff */
+    .dataTables_info {
+        font-weight: normal;
+    }
+
+    .dataTables_wrapper {
+        padding-bottom: 0;
+    }
+
+    .ui-widget-header {
+        font-weight: inherit;
+    }
+
+    .css_right {
+        float: right;
+    }
+
+    .css_left {
+        float: left;
+    }
+
+    .dataTables_length {
+        width: auto;
+    }
 </style>
 
 <script>
-	var eTable = null;
-	
-		
-
-	$j(document).ready(function(){
-
-		if (eTable == null) {
-			
-			eTable = $j("#errorTable").dataTable({
-				bAutoWidth: false,
-				bDeferRender: true,
-				bJQueryUI: true,
-				bPaginate: true,
-				sPaginationType: "full_numbers",
-				aoColumnDefs: [
-					{ aTargets: ["_all"], bSortable: false },
-					{
-						aTargets: [0],
-						sClass: "centered",
-						mData: null,
-					    mRender: function(data, type, full) {
-								var id = full.id;
-								return '<input name="errorIds" type="checkbox" value="' + id + '"/>';
-							}
-					},
-	                {
-	                    aTargets: [1],
-	                    sClass: "centered",
-	                    mData: null,
-	                    mRender: function(data, type, full) {
-	                        var id = full.id;
-	                        var out = "";
-	                        if (full.comment) {
-	                            out += '<button class="action resolve" errorId="' + id + '">Resolve</button>';
-	                        } else {
-	                            out += '<button class="action comment" errorId="' + id + '">Comment</button>';
-	                        }
-	                        return out;
-	                    }
-	                },
-	                { aTargets: [2], mData: "id" },
-					{ aTargets: [3], mData: "error" },
-					{ aTargets: [4], mData: "errorDetails" },
-					{ aTargets: [5], mData: "formName" },
-					{ aTargets: [6], mData: "comment", sClass: "centered" }
-				],
-				bProcessing: true,
-				bServerSide: true,
-				bStateSave: false,
-				fnDrawCallback: function(oSettings){
-					if ($j("span.numSelected").html() == oSettings.fnRecordsDisplay()) {
-						$j("input[name=errorIds]").attr("checked", "checked");
-					} else {
-						$j("span.numDisplayed").html(oSettings.fnRecordsDisplay());
-						$j("#selectAll").removeAttr("checked");
-						$j("input[name=errorIds]").removeAttr("checked");
-						updateNumSelected(0);
-					}
-				},
-				sAjaxSource: "<openmrs:contextPath/>/module/amrsmobileforms/errorList.json"
-			});
-			
-		}
-		else{
-			
-			eTable.fnClearTable( 0 );
-			eTable.fnDraw();
-			
-		}
-		// set up the error datatable 
-		
-
-
-		// click events for comment and resolve buttons
-		
-		
-		$j("button.comment").live("click", function(){
-			var errorId = $j(this).attr("errorId");
-           // document.location = "resolveErrorComment.form?errorId=" + $j(this).attr("errorId");
-            DWRAMRSMobileFormsService.populateCommentForm(errorId ,function(data){
-                  errObj= data[0];
-                  
-                  var tableExist = $j("#errorsummary");
-                  if(tableExist!=null){
-                	  $j("#errorsummary").remove();  
-                  }
-                  generate_table(errObj,"ttable",1);
-
-
-
-            });
-            
-            
-            $j( "#dialog-form" ).dialog({
-                height: 600,
-                width: 1000,
-                modal: false,
-                buttons:{
-                    "Submit Comment":function(){
-                    	 var commentt = $j("#comment").val();
-                    	 
-                    	 if(commentt != null){
-                    		 DWRAMRSMobileFormsService.saveComment(errorId,commentt,alertResult);
-                        	  
-                    	 }
-                    	 else{
-                    		 alert("Please the field for comment is empty!");
-                    		 $j("#comment").focus();
-                    	 }
-                    	 
-
-                    },
-                    close:closecFunction,
-                    Cancel: function() {
-                        $j(this).dialog( "close" );
+var eTable = null;
+
+
+$j(document).ready(function () {
+
+    // set up the error datatable
+
+    if (eTable == null) {
+
+        eTable = $j("#errorTable").dataTable({
+            bAutoWidth: false,
+            bDeferRender: true,
+            bJQueryUI: true,
+            bPaginate: true,
+            sPaginationType: "full_numbers",
+            aoColumnDefs: [
+                { aTargets: ["_all"], bSortable: false },
+                {
+                    aTargets: [0],
+                    sClass: "centered",
+                    mData: null,
+                    mRender: function (data, type, full) {
+                        var id = full.id;
+                        return '<input name="errorIds" type="checkbox" value="' + id + '"/>';
                     }
+                },
+                {
+                    aTargets: [1],
+                    sClass: "centered",
+                    mData: null,
+                    mRender: function (data, type, full) {
+                        var id = full.id;
+                        var out = "";
+                        if (full.comment) {
+                            out += '<button class="action resolve" errorId="' + id + '">Resolve</button>';
+                        } else {
+                            out += '<button class="action comment" errorId="' + id + '">Comment</button>';
+                        }
+                        return out;
+                    }
+                },
+                { aTargets: [2], mData: "id" },
+                { aTargets: [3], mData: "location"},
+                { aTargets: [4], mData: "provider"},
+                { aTargets: [5], mData: "error" },
+                { aTargets: [6], mData: "errorDetails" },
+                { aTargets: [7], mData: "formName" },
+                { aTargets: [8], mData: "comment", sClass: "centered" }
+            ],
+            bProcessing: true,
+            bServerSide: true,
+            bStateSave: false,
+            fnDrawCallback: function (oSettings) {
+                if ($j("span.numSelected").html() == oSettings.fnRecordsDisplay()) {
+                    $j("input[name=errorIds]").attr("checked", "checked");
+                } else {
+                    $j("span.numDisplayed").html(oSettings.fnRecordsDisplay());
+                    $j("#selectAll").removeAttr("checked");
+                    $j("input[name=errorIds]").removeAttr("checked");
+                    updateNumSelected(0);
                 }
+            },
+            sAjaxSource: "<openmrs:contextPath/>/module/amrsmobileforms/errorList.json"
+        });
 
-            });
+    }
+    else {
 
-            return false;
+        eTable.fnClearTable(0);
+        eTable.fnDraw();
 
+    }
+    // set up the error datatable
+
+
+    // click events for comment and resolve buttons
+
+
+    $j("button.comment").live("click", function () {
+        var errorId = $j(this).attr("errorId");
+        // document.location = "resolveErrorComment.form?errorId=" + $j(this).attr("errorId");
+        DWRAMRSMobileFormsService.populateCommentForm(errorId, function (data) {
+            errObj = data[0];
+
+            var tableExist = $j("#errorsummary");
+            if (tableExist != null) {
+                $j("#errorsummary").remove();
+            }
+            generate_table(errObj, "ttable", 1);
+        });
+
+
+        $j("#dialog-form").dialog({
+            height: 600,
+            width: 1000,
+            modal: false,
+            buttons: {
+                "Submit Comment": function () {
+                    var commentt = $j("#comment").val();
+
+                    if (commentt != null) {
+                        DWRAMRSMobileFormsService.saveComment(errorId, commentt, alertResult);
+                    } else {
+                        alert("Please the field for comment is empty!");
+                        $j("#comment").focus();
+                    }
+                },
+                close: closecFunction,
+                Cancel: function () {
+                    $j(this).dialog("close");
+                }
+            }
         });
-		
-		
-		
-		
-
-        $j("button.resolve").live("click", function(){ 
-        	//document.location = "resolveError.form?errorId=" + $j(this).attr("errorId"); return false;
-        	
-        	var errorId = $j(this).attr("errorId");
-        	
-        	 var tableExist = $j("#resolveerror");
-             if(tableExist!=null){
-           	  $j("#resolveerror").remove();  
-             }
-        	
-        	
-              DWRAMRSMobileFormsService.populateCommentForm(errorId ,function(data){
-                   var errObj= data[0];
-                   generate_ResolveError_table(errObj);
-                  
-
-             });
-
-
-             
-             $j( "#resolveError" ).dialog({
-                 height: 600,
-                 width: 1000,
-                 modal: false,
-                 buttons:{
-                     "Resolve Error":function(){
-                    	 
-                    		var provider = document.getElementById('selprovider').value;
-                           	var patientIdentifier = document.getElementsByName('patientIdentifier').value;
-                           	var dob = document.getElementsByName('birthDate').value;
-                           	var newHousehold = document.getElementsByName('householdId').value;
-                           	var householdId = document.getElementsByName('householdIdentifier').value;
-                            var patientId = document.getElementById('selpatient').value;
-                           	var errorItemAction = getSelectedRadio();
-               	 
-              
-                    	 
-                   
-	                   	 if(errorItemAction != null){
-	DWRAMRSMobileFormsService.resolveError(householdId,errorId,errorItemAction,dob,patientIdentifier,provider,newHousehold,patientId,resolveErrorResult);
-	                      	  
-	                   	 }
-	                   	 else{
-	                   		 alert("Please select the action to take");
-	                   		
-	                   	 }  
-                     	 
-                     	                    	 
-
-                     },
-                     close:closeFunction,
-                     Cancel: function() {
-                         $j(this).dialog( "close" );
-                     }
-                 }
-
-             });
-
-             return false;
-
- 
+
+        return false;
+    });
+
+
+    $j("button.resolve").live("click", function () {
+
+        var errorId = $j(this).attr("errorId");
+
+        var tableExist = $j("#resolveerror");
+        if (tableExist != null) {
+            $j("#resolveerror").remove();
+        }
+
+        DWRAMRSMobileFormsService.populateCommentForm(errorId, function (data) {
+            var errObj = data[0];
+            clearElements();
+            generate_ResolveError_table(errObj);
         });
 
-		// click event for selectAll checkbox
-		$j("#selectAll").click(function(){
-			if ($j(this).is(":checked")) {
-				$j("input[name=errorIds]").attr("checked", "checked");
-				updateNumSelected($j("span.numDisplayed").html());
-			} else {
-				$j("input[name=errorIds]").removeAttr("checked");
-				updateNumSelected(0);
-			}
-		});
-
-		// click event for individual checkboxes
-		$j("input[name=errorIds]").live("click", function(){ updateNumSelected(); });
-
-		// click event for reprocessAll button
-		$j("#reprocessAll").click(function(){
-			var url = "reprocessBatch.htm";
-			// TODO use formdata or jquery to manipulate errorIds into something cool
-			var params = [];
-			$j("input[name=errorIds]:checked").each(function(){
-				params.push("errorIds=" + $j(this).val());
-			});
-			if ($j("#selectAll").is(":checked")) {
-				params.push("all=1");
-			}
-			params.push("query=" + $j("div.dataTables_filter input").val());
-			document.location = url + "?" + params.join("&");
-		});
-	});
-	
-	function closecFunction(){
-		 $j("#dialog-form").dialog( "close" );
-	}
-	function closeFunction(){
-		 $j("#resolveError").dialog( "close" );
-		 clearDivSelections();
-	}
-	function refreshDataTable(){
-		eTable.fnClearTable( 0 );
-		eTable.fnDraw();
-	}
-	
-	function resolveErrorResult(data){
-		
-		var div = document.getElementById("openmrs_msg");		
-		
-		
-		var resultId =data[0];
-		//resultId.trim();
-		var resultMsg = data[1];
-		//resultMsg.trim();
-		if(resultId==0){
-			
-			div.style.display = "block";
-			div.innerHTML = " <b>" + resultMsg + "</b>";
-			
-			
-				
-		}
-		else if(resultId==1){
-			closeFunction();
-			div.style.display = "block";
-			div.innerHTML = " <b>" + resultMsg + "</b>";
-			refreshDataTable();
-			//document.location.reload(true);
-		}
-		else if(resultId==2){
-			closeFunction();
-			div.style.display = "block";
-			div.innerHTML = " <b>" + resultMsg + "</b>";
-			
-		}
-		else{
-			closeFunction();
-			div.style.display = "block";
-			div.innerHTML = " <b>" + resultMsg + "</b>";
-			refreshDataTable();
-		}
-		
-		
-	}
-	
-	function alertResult(data){
-				
-		var div = document.getElementById("openmrs_msg");
-		
-		div.style.display = "block";
-		div.innerHTML = " <b>" + data + "</b>";
-		
-		if(data =="Comment saved successfully"){
-			closecFunction();
-			refreshDataTable();
-		}
-		
-		
-	}
-	
-	
-	function buildRow(label,tdvalue){
-		
-		var row = document.createElement("tr");
-        var cell = document.createElement("th");
-        var cell2 = document.createElement("td");
-        var celllabel = document.createTextNode(label+": ");
-        var cellval = document.createTextNode(tdvalue);
-        cell.appendChild(celllabel);
-        cell2.appendChild(cellval);
-        row.appendChild(cell);
-        row.appendChild(cell2);
-        return row;
-	}
-	
-function buildRowWithElement(label,tdvalue){
-		
-		var row = document.createElement("tr");
-        var cell = document.createElement("th");
-        var cell2 = document.createElement("td");
-        var div = document.createElement("div");
-        div.setAttribute('style','height: 40px; overflow-y: scroll; border: 1px solid #BBB;');
-       
-        var celllabel = document.createTextNode(label+": ");
-        var cellval = document.createTextNode(tdvalue);
-        div.appendChild(cellval);
-        cell.appendChild(celllabel);
-        cell2.appendChild(div);
-        row.appendChild(cell);
-        row.appendChild(cell2);
-        return row;
-	}
-	
-function buildTextArea(label,id){
-	var row = document.createElement("tr");
+        $j("#resolveError").dialog({
+            height: 600,
+            width: 1000,
+            modal: false,
+            buttons: {
+                "Resolve Error": function () {
+
+                    var providerId =  document.getElementById('selprovider').value==null;
+                    var patientId = document.getElementById('selpatient').value;
+                    var patientIdentifier = document.getElementById('patientIdentifier').value;
+                    var birthDate = document.getElementById('birthDate').value;
+                    var householdId = document.getElementById('householdId').value;
+                    var householdIdentifier = document.getElementById('householdIdentifier').value;
+                    var errorItemAction = getSelectedRadio();
+                    var url ="resolveErrorsFromDialog.htm";
+                    var params = [];
+                    params.push("householdId="+householdId);
+                    params.push("errorId="+errorId);
+                    params.push("errorItemAction="+errorItemAction);
+                    params.push("birthDate="+birthDate);
+                    params.push("patientIdentifier="+patientIdentifier);
+                    params.push("providerId="+providerId);
+                    params.push("householdIdentifier="+householdIdentifier);
+                    params.push("patientId="+patientId);
+
+
+                    if (errorItemAction != null) {
+
+                        document.location = url + "?" + params.join("&");
+                       /*DWRAMRSMobileFormsService.resolveError(householdId, errorId, errorItemAction, birthDate,
+                        patientIdentifier, providerId, householdIdentifier,patientId, resolveErrorResult);*/
+                    } else {
+                        alert("Please select the action to take");
+                    }
+                },
+                close: closeFunction,
+                Cancel: function () {
+                    $j(this).dialog("close");
+                }
+            }
+        });
+
+        return false;
+    });
+
+    // click event for selectAll checkbox
+    $j("#selectAll").click(function () {
+        if ($j(this).is(":checked")) {
+            $j("input[name=errorIds]").attr("checked", "checked");
+            updateNumSelected($j("span.numDisplayed").html());
+        } else {
+            $j("input[name=errorIds]").removeAttr("checked");
+            updateNumSelected(0);
+        }
+    });
+
+    // click event for individual checkboxes
+    $j("input[name=errorIds]").live("click", function () {
+        updateNumSelected();
+    });
+
+    // click event for reprocessAll button
+    $j("#reprocessAll").click(function () {
+        var url = "reprocessBatch.htm";
+        // TODO use formdata or jquery to manipulate errorIds into something cool
+        var params = [];
+        $j("input[name=errorIds]:checked").each(function () {
+            params.push("errorIds=" + $j(this).val());
+        });
+        if ($j("#selectAll").is(":checked")) {
+            params.push("all=1");
+        }
+        params.push("query=" + $j("div.dataTables_filter input").val());
+        document.location = url + "?" + params.join("&");
+    });
+});
+
+function closecFunction() {
+    $j("#dialog-form").dialog("close");
+}
+function closeFunction() {
+    $j("#resolveError").dialog("close");
+}
+function refreshDataTable() {
+    eTable.fnClearTable(0);
+    eTable.fnDraw();
+}
+
+function resolveErrorResult(data) {
+
+    var div = document.getElementById("openmrs_msg");
+
+    var resultId = data[0];
+    var resultMsg = data[1];
+
+    if (resultId == 0) {
+        div.style.display = "block";
+        div.innerHTML = " <b>" + resultMsg + "</b>";
+    } else if (resultId == 1) {
+        closeFunction();
+        div.style.display = "block";
+        div.innerHTML = " <b>" + resultMsg + "</b>";
+        refreshDataTable();
+        //document.location.reload(true);
+    } else if (resultId == 2) {
+        closeFunction();
+        div.style.display = "block";
+        div.innerHTML = " <b>" + resultMsg + "</b>";
+    } else {
+        closeFunction();
+        div.style.display = "block";
+        div.innerHTML = " <b>" + resultMsg + "</b>";
+        refreshDataTable();
+    }
+}
+
+function alertResult(data) {
+
+    var div = document.getElementById("openmrs_msg");
+
+    div.style.display = "block";
+    div.innerHTML = " <b>" + data + "</b>";
+
+    if (data == "Comment saved successfully") {
+        closecFunction();
+        refreshDataTable();
+    }
+}
+
+function buildRow(label, tdvalue) {
+
+    var row = document.createElement("tr");
+    var cell = document.createElement("th");
+    var cell2 = document.createElement("td");
+    var celllabel = document.createTextNode(label + ": ");
+    var cellval = document.createTextNode(tdvalue);
+    cell.appendChild(celllabel);
+    cell2.appendChild(cellval);
+    row.appendChild(cell);
+    row.appendChild(cell2);
+    return row;
+}
+
+function buildRowWithElement(label, tdvalue) {
+
+    var row = document.createElement("tr");
     var cell = document.createElement("th");
     var cell2 = document.createElement("td");
-    var celllabel = document.createTextNode(label+": ");
-    
-    
+    var div = document.createElement("div");
+    div.setAttribute('style', 'height: 40px; overflow-y: scroll; border: 1px solid #BBB;');
+
+    var celllabel = document.createTextNode(label + ": ");
+    var cellval = document.createTextNode(tdvalue);
+    div.appendChild(cellval);
+    cell.appendChild(celllabel);
+    cell2.appendChild(div);
+    row.appendChild(cell);
+    row.appendChild(cell2);
+    return row;
+}
+
+function buildTextArea(label, id) {
+    var row = document.createElement("tr");
+    var cell = document.createElement("th");
+    var cell2 = document.createElement("td");
+    var celllabel = document.createTextNode(label + ": ");
+
     var textarea = document.createElement("textarea");
-    textarea.setAttribute('cols','120');
-    textarea.setAttribute('rows','3');
-    textarea.setAttribute('id',id);
-    
+    textarea.setAttribute('cols', '120');
+    textarea.setAttribute('rows', '3');
+    textarea.setAttribute('id', id);
+
     cell.appendChild(celllabel);
     cell2.appendChild(textarea);
-    
+
     row.appendChild(cell);
     row.appendChild(cell2);
+
     return row;
-    
-    
 }
 
 
 /* Displays a summary dialog window with error details plus a provision to comment on an error
-*/
-
-    function generate_table(data,bodyDiv,option) {
-
-        var body = document.getElementById(bodyDiv);
-        
-        var tbl     = document.createElement("table");
-        tbl.setAttribute('width','100%');
-        tbl.setAttribute('class','tblformat');
-     
-		tbl.setAttribute('id','errorsummary');
-	
-
-        var tblBody = document.createElement("tbody");
-        
-        var pname = buildRow("Person Name",data.name);      
-        var pid = buildRow("Person Identifier",data.identifier);
-        var gender = buildRow("Gender",data.gender);
-        var location = buildRow("Location",data.location);
-        
-        var edate = buildRow("Encounter Date",data.encounterDate);
-        var modelname = buildRow("Form Name",data.formModelName);
-        var formid = buildRow("Form ID",data.formId);
-        var errorid = buildRow("Error ID",data.mobileFormEntryErrorId);
-        var datecreated = buildRow("Date Created",data.dateCreated);
-        var error = buildRow("Error",data.error);
-        
-        var totalHousehold = buildRow("Total Household",data.totalHousehold);
-        var totalEligible = buildRow("Total Eligible",data.totalEligible);
-        var providerId = buildRow("Provider Id",data.providerId);
-        
-        var errdetails = buildRowWithElement("Error Details",data.errorDetails);
-                
-        var comment = buildTextArea("Comment","comment");
-        
-     
-  
-        
-        tblBody.appendChild(pname);
-        tblBody.appendChild(pid);
-        tblBody.appendChild(gender); 
-        tblBody.appendChild(location);
-        tblBody.appendChild(edate); 
-        tblBody.appendChild(modelname); 
-        tblBody.appendChild(formid); 
-        tblBody.appendChild(errorid); 
-        tblBody.appendChild(datecreated);
-        tblBody.appendChild(error); 
-        tblBody.appendChild(totalHousehold);
-        tblBody.appendChild(totalEligible);
-        tblBody.appendChild(providerId);
-        tblBody.appendChild(errdetails);
-       
-        
-        tblBody.appendChild(comment);
-        
-        tbl.appendChild(tblBody);
-        
-        body.appendChild(tbl);
-        tbl.setAttribute("border", "1");
-        
-        //---------------------------------------
-     
-    }
-    
+ */
+
+function generate_table(data, bodyDiv, option) {
+
+    var body = document.getElementById(bodyDiv);
+
+    var tbl = document.createElement("table");
+    tbl.setAttribute('width', '100%');
+    tbl.setAttribute('class', 'tblformat');
+    tbl.setAttribute('id', 'errorsummary');
+
+    var tblBody = document.createElement("tbody");
+
+    var pname = buildRow("Person Name", data.name);
+    var pid = buildRow("Person Identifier", data.identifier);
+    var gender = buildRow("Gender", data.gender);
+    var location = buildRow("Location", data.locationId);
+
+    var edate = buildRow("Encounter Date", data.encounterDate);
+    var modelname = buildRow("Form Name", data.formModelName);
+    var formid = buildRow("Form ID", data.formId);
+    var errorid = buildRow("Error ID", data.mobileFormEntryErrorId);
+    var datecreated = buildRow("Date Created", data.dateCreated);
+    var error = buildRow("Error", data.error);
+
+    var totalHousehold = buildRow("Total Household", data.totalHousehold);
+    var totalEligible = buildRow("Total Eligible", data.totalEligible);
+    var providerId = buildRow("Provider Id", data.providerId);
+
+    var errdetails = buildRowWithElement("Error Details", data.errorDetails);
+
+    var comment = buildTextArea("Comment", "comment");
+
+    tblBody.appendChild(pname);
+    tblBody.appendChild(pid);
+    tblBody.appendChild(gender);
+    tblBody.appendChild(location);
+    tblBody.appendChild(edate);
+    tblBody.appendChild(modelname);
+    tblBody.appendChild(formid);
+    tblBody.appendChild(errorid);
+    tblBody.appendChild(datecreated);
+    tblBody.appendChild(error);
+    tblBody.appendChild(totalHousehold);
+    tblBody.appendChild(totalEligible);
+    tblBody.appendChild(providerId);
+    tblBody.appendChild(errdetails);
+
+
+    tblBody.appendChild(comment);
+
+    tbl.appendChild(tblBody);
+
+    body.appendChild(tbl);
+    tbl.setAttribute("border", "1");
+
+    //---------------------------------------
+
+}
+
 /* Displays a dialog window for resolving errors. It provides relevant options for resolving errors*/
 
 function generate_ResolveError_table(data) {
 
 
-        var body = document.getElementById("resolveErrorTable");
-        
-        var tbl     = document.createElement("table");
-        tbl.setAttribute('width','100%');
-     
-		 tbl.setAttribute('id','resolveerror');
-		 tbl.setAttribute('class','tblformat');
-	
-        var tblBody = document.createElement("tbody");
-	
-   
-    	 var comment = buildRow("Comment",data.comment);
-    	 var commentedBy = buildRow("Commented By",data.commentedBy);
-    	 var dateCommented = buildRow("Date Commented",data.dateCommented);
-   	
-
-        var pname = buildRow("Person Name",data.name);      
-        var pid = buildRow("Person Identifier",data.identifier);
-        var gender = buildRow("Gender",data.gender);
-        var location = buildRow("Location",data.location);
-        
-        var encdate = buildRow("Encounter Date",data.encounterDate);
-        var formmodelname = buildRow("Form Name",data.formModelName);
-        var formid = buildRow("Form ID",data.formId);
-        var errorid = buildRow("Error ID",data.mobileFormEntryErrorId);
-        var datecreated = buildRow("Date Created",data.dateCreated);
-        var err = buildRow("Error",data.error);
-        
-        var totalhousehold = buildRow("Total Household",data.totalHousehold);
-        var totaleligible = buildRow("Total Eligible",data.totalEligible);
-        var providerId = buildRow("Provider Id",data.providerId);
-        var errdetails = buildRowWithElement("Error Details",data.errorDetails);
-        var formname = buildRowWithElement("XML Form",data.formName);
-        
-        	tblBody.appendChild(comment);
-        	tblBody.appendChild(commentedBy);
-        	tblBody.appendChild(dateCommented);
-       	
-        
-        tblBody.appendChild(pname);
-        tblBody.appendChild(pid);
-        tblBody.appendChild(gender); 
-        tblBody.appendChild(location);
-        tblBody.appendChild(encdate); 
-        tblBody.appendChild(formmodelname); 
-        tblBody.appendChild(formid); 
-        tblBody.appendChild(errorid); 
-        tblBody.appendChild(datecreated);
-        tblBody.appendChild(err); 
-        
-        tblBody.appendChild(totalhousehold); 
-        tblBody.appendChild(totaleligible); 
-        tblBody.appendChild(providerId);
-        tblBody.appendChild(errdetails);
-       
-        tbl.appendChild(tblBody);
-        
-        body.appendChild(tbl);
-        tbl.setAttribute("border", "0");
-        
-        //---------------------------------------
-     
-    }
-    
-    /* clears out marked options on error resolution dialog window on close of the window  */
-    function clearDivSelections(){
-		var selOpt = document.getElementsByName('errorItemAction');
-    	var noChangeOptionPosition = selOpt.length - 1;
-    	
-    	if(selOpt[noChangeOptionPosition].checked==false){
-			selOpt[noChangeOptionPosition].checked=true;
-		}
-    	
-    	//
-    	document.getElementById("selpatient").value = "";
-    	document.getElementById("selprovider").value = "";
-    	document.getElementById("patientId_id_selection").innerHTML = "";
-    	document.getElementById("providerId_id_selection").innerHTML = "";
-    	
-    	
-    }
-    
-    function getSelectedRadio(){
-    	var selOpt = document.getElementsByName('errorItemAction');
-    	
-    	for(var i = 0;i<selOpt.length;i++){
-    		if(selOpt[i].checked){
-    			return selOpt[i].value;
-    		}
-    		
-    	}
-    	return null;
+    var body = document.getElementById("resolveErrorTable");
+
+    var tbl = document.createElement("table");
+    tbl.setAttribute('width', '100%');
+    tbl.setAttribute('id', 'resolveerror');
+    tbl.setAttribute('class', 'tblformat');
+
+    var tblBody = document.createElement("tbody");
+
+    var comment = buildRow("Comment", data.comment);
+    var commentedBy = buildRow("Commented By", data.commentedBy.username);
+    var dateCommented = buildRow("Date Commented", data.dateCommented);
+
+    var pname = buildRow("Person Name", data.name);
+    var pid = buildRow("Person Identifier", data.identifier);
+    var gender = buildRow("Gender", data.gender);
+    var location = buildRow("Location", data.locationId);
+
+    var encdate = buildRow("Encounter Date", data.encounterDate);
+    var formmodelname = buildRow("Form Name", data.formModelName);
+    var formid = buildRow("Form ID", data.formId);
+    var errorid = buildRow("Error ID", data.mobileFormEntryErrorId);
+    var datecreated = buildRow("Date Created", data.dateCreated);
+    var err = buildRow("Error", data.error);
+
+    var totalhousehold = buildRow("Total Household", data.totalHousehold);
+    var totaleligible = buildRow("Total Eligible", data.totalEligible);
+    var providerId = buildRow("Provider Id", data.providerId);
+    var errdetails = buildRowWithElement("Error Details", data.errorDetails);
+    var formname = buildRowWithElement("XML Form", data.formName);
+
+    tblBody.appendChild(comment);
+    tblBody.appendChild(commentedBy);
+    tblBody.appendChild(dateCommented);
+    tblBody.appendChild(pname);
+    tblBody.appendChild(pid);
+    tblBody.appendChild(gender);
+    tblBody.appendChild(location);
+    tblBody.appendChild(encdate);
+    tblBody.appendChild(formmodelname);
+    tblBody.appendChild(formid);
+    tblBody.appendChild(errorid);
+    tblBody.appendChild(datecreated);
+    tblBody.appendChild(err);
+    tblBody.appendChild(totalhousehold);
+    tblBody.appendChild(totaleligible);
+    tblBody.appendChild(providerId);
+    tblBody.appendChild(errdetails);
+    tbl.appendChild(tblBody);
+    body.appendChild(tbl);
+    tbl.setAttribute("border", "0");
+}
+
+function getSelectedRadio() {
+    var selOpt = document.getElementsByName('errorItemAction');
+
+    for (var i = 0; i < selOpt.length; i++) {
+        if (selOpt[i].checked) {
+            return selOpt[i].value;
+        }
     }
-    
-    // sets the value of the hidden field (provider id)
-    function setErrorAction(index,data){
-    	document.getElementById("selprovider").value = data.personId;
+    return null;
+}
+
+// sets the value of the hidden field (provider id)
+function setErrorAction(index, data) {
+    document.getElementById("selprovider").value = data.personId;
+}
+
+function setPatientField(index, data) {
+    document.getElementById("selpatient").value = data.patientId;
+}
+
+/**
+ * updates the numSelected element with a specified amount, with some after-effects
+ **/
+function updateNumSelected(amount) {
+    var numSelected = (typeof amount === "undefined") ? $j("input[name=errorIds]:checked").length : amount;
+
+    $j("span.numSelected").html(numSelected);
+
+    if (numSelected > 0)
+        $j("#reprocessAll").removeAttr("disabled");
+    else
+        $j("#reprocessAll").attr("disabled", "disabled");
+
+    if (numSelected != $j("span.numDisplayed").html())
+        $j("#selectAll").removeAttr("checked");
+}
+
+
+function doSelectionHandler(index, data) {
+    document.getElementById("selprovider").value = data.personId;
+}
+
+function clearElements(){
+
+    var textElements = document.getElementsByTagName("input");
+    for (var i=0; i < textElements.length; i++) {
+        if (textElements[i].type == 'text') {
+            textElements[i].value = '';
+        }
     }
-    
 
-    // sets the value of the hidden field (patient id)
-    function setPatient(index,data){
-    	document.getElementById("selpatient").value = data.personId;
+    var radioElements = document.getElementsByName("errorItemAction");
+    var radioLength = radioElements.length;
+    var lastRadioPosition = radioLength - 1;
 
+    for (var i=0; i < radioElements.length; i++) {
+
+        if (i != lastRadioPosition) {
+
+            radioElements[i].checked = false;
+        }
+        radioElements[i].checked = true;
     }
 
 
-	/**
-	 * updates the numSelected element with a specified amount, with some after-effects
-	 **/
-	function updateNumSelected(amount){
-		var numSelected = (typeof amount === "undefined") ? $j("input[name=errorIds]:checked").length : amount;
 
-		$j("span.numSelected").html(numSelected);
 
-		if (numSelected > 0)
-			$j("#reprocessAll").removeAttr("disabled");
-		else
-			$j("#reprocessAll").attr("disabled", "disabled");
+}
 
-		if (numSelected != $j("span.numDisplayed").html())
-			$j("#selectAll").removeAttr("checked");
-	}
-	
-	
-	
-	function doSelectionHandler(index, data) {
-	        document.getElementById("selprovider").value =data.personId;
-	    }
-	 
 
 </script>
 
@@ -612,161 +613,153 @@ function generate_ResolveError_table(data) {
 <div class="box" id="resolveError" title="Error Resolution Dialog" style="display:none;">
 
     <div id="resolveErrorTable">
-    
+
     </div>
-    
+
     <div>
-    	<table>
-    		   <tr>
-			    	<td>
-					<!-- Pick a provider -->
-					<input type="radio" name="errorItemAction" value="linkProvider"/> 
-					<spring:message code="amrsmobileforms.resolveErrors.action.providerLink"/>
-					</td>
-					<td>
-					<openmrs_tag:userField formFieldName="providerId" searchLabelCode="amrsmobileforms.resolveErrors.action.findProvider" initialValue="" callback="setErrorAction" />
-					</td>
-				</tr>
-				 <tr>
-			    	<td>
-					<!-- Pick a patient -->
-					<input type="radio" name="errorItemAction" value="linkPatient"/> 
-					<spring:message code="amrsmobileforms.resolveErrors.action.linkPatient"/>
-					</td>
-					<td>
-					<openmrs_tag:patientField formFieldName="patientId" searchLabelCode="amrsmobileforms.resolveErrors.action.linkPatient" initialValue="" callback="setPatient" />
-					</td>
-				</tr>
-				
-				<tr>
-					<td>
-				
-			
-					<!-- Have the machinery create a new patient -->
-					<input type="radio" name="errorItemAction" value="createPatient" /> 
-					<spring:message code="amrsmobileforms.resolveErrors.action.createPatient"/>
-					</td>
-					<td/>
-				</tr>	
-				 <tr>
-			    	<td>
-					<!-- Assign a new patient identifier-->
-					<input type="radio" name="errorItemAction" value="newIdentifier" /> 
-					<spring:message code="amrsmobileforms.resolveErrors.action.newIdentifier"/>:
-											
-					</td>
-					<td>
-					<input type="text" name="patientIdentifier"/>
-					</td>
-				</tr>
-				 <tr>
-			    	<td>
-					<!-- Assign a birth date to patient -->
-				<input type="radio" name="errorItemAction" value="assignBirthdate" /> 
-				<spring:message code="amrsmobileforms.resolveErrors.action.assignBirthDate"/>:
-					</td>
-					<td>
-					<input type="text" name="birthDate" onClick="showCalendar(this)"/>
-					</td>
-				</tr>
-				
-				<tr>
-			    	<td>
-					<!-- Link patient to household -->
-				<input type="radio" name="errorItemAction" value="linkHousehold" />	
-				<spring:message code="amrsmobileforms.resolveErrors.action.createLink"/>:
-					</td>
-					<td>
-					<input type="text" name="householdId"/>
-					</td>
-				</tr>
-				<tr>
-			    	<td>
-					<input type="radio" name="errorItemAction" value="newHousehold" />	
-					<spring:message code="amrsmobileforms.resolveErrors.action.newHouseholdIdentifier"/>:
-					</td>
-					<td>
-					<input type="text" name="householdIdentifier"/>
-					</td>
-				</tr>
-				<tr>
-			    	<td>
-					<!-- This is an invalid comment, delete it -->
-					<input type="radio" name="errorItemAction" value="deleteComment" />	
-					<spring:message code="amrsmobileforms.resolveErrors.action.deleteComment"/>
-					</td>
-					<td>
-					
-					</td>
-				</tr>
-				<tr>
-			    	<td>
-				<!-- This is an invalid error, delete it -->
-				<input type="radio" name="errorItemAction" value="deleteError" /> 
-				<spring:message code="amrsmobileforms.resolveErrors.action.deleteError"/>
-				</td>
-					<td>
-
-					<input type="hidden" id="selpatient" value=""/>
-
-					</td>
-				</tr>	
-				
-				<tr>
-			    	<td>
-				<!-- I don't want to do anything to this one now -->
-				<input type="radio" name="errorItemAction" value="noChange" checked="checked"/> 
-				<spring:message code="amrsmobileforms.resolveErrors.action.noChange"/>
-				</td>
-					<td>
-					<input type="hidden" id="selprovider" value=""/>
-					</td>
-				</tr>
-    	
-    	
-    	
-    	</table>
-    
-    
+        <table>
+            <tr>
+                <td>
+                    <!-- Pick a provider -->
+                    <input type="radio" name="errorItemAction" value="linkProvider"/>
+                    <spring:message code="amrsmobileforms.resolveErrors.action.providerLink"/>
+                </td>
+                <td>
+                    <openmrs_tag:userField formFieldName="providerId"
+                                           searchLabelCode="amrsmobileforms.resolveErrors.action.findProvider"
+                                           initialValue="" callback="setErrorAction"/>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <!-- Pick a patient -->
+                    <input type="radio" name="errorItemAction" value="linkPatient"/>
+                    <spring:message code="amrsmobileforms.resolveErrors.action.patientLink"/>
+                </td>
+                <td>
+                    <openmrs_tag:patientField formFieldName="patientId"
+                                           searchLabelCode="amrsmobileforms.resolveErrors.action.findPatient"
+                                           initialValue="" callback="setPatientField"/>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <!-- Have the machinery create a new patient -->
+                    <input type="radio" name="errorItemAction" value="createPatient"/>
+                    <spring:message code="amrsmobileforms.resolveErrors.action.createPatient"/>
+                </td>
+                <td/>
+            </tr>
+            <tr>
+                <td>
+                    <!-- Assign a new patient identifier-->
+                    <input type="radio" name="errorItemAction" value="newIdentifier"/>
+                    <spring:message code="amrsmobileforms.resolveErrors.action.newIdentifier"/>:
+                </td>
+                <td>
+                    <input type="text" id="patientIdentifier" name="patientIdentifier"/>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <!-- Assign a birth date to patient -->
+                    <input type="radio" name="errorItemAction" value="assignBirthdate"/>
+                    <spring:message code="amrsmobileforms.resolveErrors.action.assignBirthDate"/>:
+                </td>
+                <td>
+                    <input type="text" name="birthDate" id="birthDate" onClick="showCalendar(this)"/>
+                </td>
+            </tr>
+
+            <tr>
+                <td>
+                    <!-- Link patient to household -->
+                    <input type="radio" name="errorItemAction" value="linkHousehold"/>
+                    <spring:message code="amrsmobileforms.resolveErrors.action.createLink"/>:
+                </td>
+                <td>
+                    <input type="text" id="householdId" name="householdId"/>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <input type="radio" name="errorItemAction" value="newHousehold"/>
+                    <spring:message code="amrsmobileforms.resolveErrors.action.newHouseholdIdentifier"/>:
+                </td>
+                <td>
+                    <input type="text" id="householdIdentifier" name="householdIdentifier"/>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <!-- This is an invalid comment, delete it -->
+                    <input type="radio" name="errorItemAction" value="deleteComment"/>
+                    <spring:message code="amrsmobileforms.resolveErrors.action.deleteComment"/>
+                </td>
+                <td>
+
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <!-- This is an invalid error, delete it -->
+                    <input type="radio" name="errorItemAction" value="deleteError"/>
+                    <spring:message code="amrsmobileforms.resolveErrors.action.deleteError"/>
+                </td>
+                <td>
+
+                </td>
+            </tr>
+
+            <tr>
+                <td>
+                    <!-- I don't want to do anything to this one now -->
+                    <input type="radio" name="errorItemAction" value="noChange" checked="checked"/>
+                    <spring:message code="amrsmobileforms.resolveErrors.action.noChange"/>
+                </td>
+                <td>
+                    <input type="hidden" id="selprovider" value=""/>
+                    <input type="hidden" id="selpatient" value=""/>
+
+                </td>
+            </tr>
+        </table>
     </div>
-    
-    
-
 </div>
 
-<div id="openmrs_msg" ></div>
+<div id="openmrs_msg"></div>
 
 <div><b class="boxHeader">Mobile Form Entry Errors</b>
-	<div class="box">
-		<div id="tools">
-			<input id="selectAll" type="checkbox"/> Select All <span class="numDisplayed"></span> in Search Results (including unseen)
-			 &nbsp; &nbsp;
-			<button id="reprocessAll" disabled>Reprocess <span class="numSelected">0</span> Selected Errors</button>
-		</div>
-		<div id="errors">
-		
-		
-		
-		
-			<form method="post">
-				<table id="errorTable" cellpadding="8" cellspacing="0">
-					<thead>
-						<tr>
-							<th>Select</th>
-                            <th>Action</th>
-                            <th>ID</th>
-                            <th>Error</th>
-							<th>Error Details</th>
-							<th>Form Name</th>
-							<th>Comment</th>
-						</tr>
-					</thead>
-					<tbody>
-					</tbody>
-				</table>
-			</form>
-		</div>
-	</div>
+
+    <div class="box">
+        <div id="tools">
+            <input id="selectAll" type="checkbox"/> Select All <span class="numDisplayed"></span> in Search Results
+            (including unseen)
+            &nbsp; &nbsp;
+            <button id="reprocessAll" disabled>Reprocess <span class="numSelected">0</span> Selected Errors</button>
+        </div>
+        <div id="errors">
+            <form method="post">
+                <table id="errorTable" cellpadding="8" cellspacing="0">
+                    <thead>
+                    <tr>
+                        <th>Select</th>
+                        <th>Action</th>
+                        <th>ID</th>
+                        <th>Location</th>
+                        <th>Provider</th>
+                        <th>Error</th>
+                        <th>Error Details</th>
+                        <th>Form Name</th>
+                        <th>Comment</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    </tbody>
+                </table>
+            </form>
+        </div>
+    </div>
 </div>
 
-<%@ include file="/WEB-INF/template/footer.jsp" %>
\ No newline at end of file
+<%@ include file="/WEB-INF/template/footer.jsp" %>
diff --git a/pom.xml b/pom.xml
index 2b6d76d..80eb0cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,13 @@
 		</dependencies>
 	</dependencyManagement>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>1.8.7</version>
+        </dependency>
+    </dependencies>
 
 	<build>
 		<pluginManagement>