diff --git a/mifosng-data/src/main/java/org/mifosng/data/PermissionData.java b/mifosng-data/src/main/java/org/mifosng/data/PermissionData.java
index f0da59e47..c42026a0b 100644
--- a/mifosng-data/src/main/java/org/mifosng/data/PermissionData.java
+++ b/mifosng-data/src/main/java/org/mifosng/data/PermissionData.java
@@ -2,12 +2,9 @@ package org.mifosng.data;
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.annotate.JsonFilter;
 
-@XmlRootElement(name = "permission")
 @JsonIgnoreProperties({ "orgId" })
 @JsonFilter("permissionFilter")
 public class PermissionData implements Serializable {
diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/userhome.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/userhome.jsp
index d06157dfc..a9a1172c1 100644
--- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/userhome.jsp
+++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/admin/userhome.jsp
@@ -427,14 +427,15 @@ $(document).ready(function() {
 			  		xhr.setRequestHeader("Authorization", "Basic " + base64);
 			  },
 			  success: function(data, textStatus, jqXHR) {
-				console.log(data);  
-				var officeListHtml = $(templateSelector).render(data);
-				$(displayAreaDivSelector).html(officeListHtml);  
+				var usersObject = new Object();
+				usersObject.users = data;
+				var usersListHtml = $(templateSelector).render(usersObject);
+				$(displayAreaDivSelector).html(usersListHtml);  
 				
 				$("a.edit").click( function(e) {
 					var linkId = this.id;
 					var entityId = linkId.replace("edit", "");
-					var getUrl = baseApiUrl + 'users/' + entityId;
+					var getUrl = baseApiUrl + 'users/' + entityId + '?template=true';
 					var putUrl = baseApiUrl + 'users/' + entityId;
 					
 					var templateSelector = "#userFormTemplate";
@@ -493,14 +494,16 @@ $(document).ready(function() {
 					xhr.setRequestHeader("Authorization", "Basic " + base64);
 			  },
 			  success: function(data, textStatus, jqXHR) {
-				console.log(data);  
-				var listHtml = $(templateSelector).render(data);
+				  
+				var rolesObject = new Object();
+				rolesObject.roles = data;
+				var listHtml = $(templateSelector).render(rolesObject);
 				$(displayAreaDivSelector).html(listHtml);
 				
 				$("a.edit").click( function(e) {
 					var linkId = this.id;
 					var entityId = linkId.replace("edit", "");
-					var getUrl = baseApiUrl + 'roles/' + entityId;
+					var getUrl = baseApiUrl + 'roles/' + entityId + '?template=true';
 					var putUrl = baseApiUrl + 'roles/' + entityId;
 					
 					var templateSelector = "#roleFormTemplate";
@@ -559,8 +562,9 @@ $(document).ready(function() {
 				xhr.setRequestHeader("Authorization", "Basic " + base64);
 			  },
 			  success: function(data, textStatus, jqXHR) {
-				console.log(data);  
-				var listHtml = $(templateSelector).render(data);
+				var permissionsObject = new Object();
+				permissionsObject.permissions = data;
+				var listHtml = $(templateSelector).render(permissionsObject);
 				$(displayAreaDivSelector).html(listHtml);
 				
 				var oTable = $("#entitytable").dataTable( {
diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/home.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/home.jsp
index c45076c9c..8e09bfbfd 100644
--- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/home.jsp
+++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/home.jsp
@@ -301,7 +301,9 @@ $(document).ready(function() {
 	            $(anchor.hash).html("error occured while ajax loading.");
 	        },
 	        success: function(data, status, xhr) {
-	        	var tableHtml = $("#clientSearchTabTemplate").render(data);
+	        	var clientObject = new Object();
+	        	clientObject.clients = data;
+	        	var tableHtml = $("#clientSearchTabTemplate").render(clientObject);
 				$("#searchtab").html(tableHtml);
 				
 				$('#client').change(function() {
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJSONFormattingServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJSONFormattingServiceImpl.java
index b4f550cb5..135db4522 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJSONFormattingServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJSONFormattingServiceImpl.java
@@ -15,16 +15,11 @@ import org.codehaus.jackson.map.ser.FilterProvider;
 import org.codehaus.jackson.map.ser.impl.SimpleBeanPropertyFilter;
 import org.codehaus.jackson.map.ser.impl.SimpleFilterProvider;
 import org.mifosng.platform.exceptions.PlatformInternalServerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 @Service
 public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 
-	private final static Logger logger = LoggerFactory
-			.getLogger(ApiJSONFormattingServiceImpl.class);
-
 	@Override
 	public String convertRequest(Object dataObject, String filterName,
 			String allowedFieldList, String selectedFields,
@@ -133,11 +128,11 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 						SimpleBeanPropertyFilter
 								.filterOutAllExcept(filterFields));
 
-			} else {
+			}
+			
 				return new SimpleFilterProvider().addFilter(filterName,
 						SimpleBeanPropertyFilter
 								.serializeAllExcept(filterFields));
-			}
 		}
 
 		if (filterName.equals("roleFilter")) {
@@ -159,16 +154,34 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 						SimpleBeanPropertyFilter
 								.filterOutAllExcept(permissionFields));
 
-			} else {
-				return new SimpleFilterProvider().addFilter(
+			} 
+				
+			return new SimpleFilterProvider().addFilter(
 						filterName,
 						SimpleBeanPropertyFilter
 								.serializeAllExcept(filterFields)).addFilter(
 						"permissionFilter",
 						SimpleBeanPropertyFilter
 								.filterOutAllExcept(permissionFields));
-			}
-
+		}
+		
+		// ADDED BY KEITH - list permissions didnt seem to be working right.
+		// added this to avoid adding null filters to object mapper.
+		if (filterName.equals("permissionFilter")) {
+			Set<String> permissionFields = new HashSet<String>();
+			permissionFields.add("id");
+			permissionFields.add("name");
+			permissionFields.add("description");
+			permissionFields.add("code");
+			permissionFields.add("groupType");
+			
+			return new SimpleFilterProvider().addFilter(
+					filterName,
+					SimpleBeanPropertyFilter
+							.filterOutAllExcept(filterFields)).addFilter(
+					"permissionFilter",
+					SimpleBeanPropertyFilter
+							.filterOutAllExcept(permissionFields));
 		}
 
 		if (filterName.equals("userFilter")) {
@@ -203,7 +216,8 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 								SimpleBeanPropertyFilter
 										.filterOutAllExcept(permissionFields));
 
-			} else {
+			} 
+			
 				return new SimpleFilterProvider()
 						.addFilter(
 								filterName,
@@ -217,7 +231,6 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 								"permissionFilter",
 								SimpleBeanPropertyFilter
 										.filterOutAllExcept(permissionFields));
-			}
 
 		}
 		return filters;
@@ -226,15 +239,15 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
 	private Boolean isTrue(String param) {
 		if (param != null && param.equalsIgnoreCase("true"))
 			return true;
-		else
-			return false;
+
+		return false;
 	}
 
 	private Boolean isPassed(String param) {
 		if (param == null || param.equals(""))
 			return false;
-		else
-			return true;
+
+		return true;
 	}
 
 }
\ No newline at end of file