diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java
index c8fa6e227..28dcad697 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java
@@ -42,7 +42,7 @@ public class AuditsApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<String>(Arrays.asList("id", "actionName", "entityName", "resourceId",
             "subresourceId", "maker", "madeOnDate", "checker", "checkedOnDate", "processingResult", "commandAsJson", "officeName",
-            "groupLevelName", "groupName", "clientName", "loanAccountNo", "savingsAccountNo"));
+            "groupLevelName", "groupName", "clientName", "loanAccountNo", "savingsAccountNo", "clientId", "loanId"));
 
     private final String resourceNameForPermissions = "AUDIT";
 
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/api/MakercheckersApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/MakercheckersApiResource.java
index 79d1556ff..4fda4c837 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/commands/api/MakercheckersApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/MakercheckersApiResource.java
@@ -44,7 +44,7 @@ public class MakercheckersApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<String>(Arrays.asList("id", "actionName", "entityName", "resourceId",
             "subresourceId", "maker", "madeOnDate", "checker", "checkedOnDate", "processingResult", "commandAsJson", "officeName",
-            "groupLevelName", "groupName", "clientName", "loanAccountNo", "savingsAccountNo"));
+            "groupLevelName", "groupName", "clientName", "loanAccountNo", "savingsAccountNo", "clientId", "loanId"));
 
     private final AuditReadPlatformService readPlatformService;
     private final DefaultToApiJsonSerializer<AuditData> toApiJsonSerializerAudit;
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java
index d134e2791..ed531dd9b 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java
@@ -45,13 +45,16 @@ public final class AuditData {
     private final String loanAccountNo;
     @SuppressWarnings("unused")
     private final String savingsAccountNo;
+    @SuppressWarnings("unused")
     private final Long clientId;
+    @SuppressWarnings("unused")
     private final Long loanId;
 
     public AuditData(final Long id, final String actionName, final String entityName, final Long resourceId, final Long subresourceId,
             final String maker, final DateTime madeOnDate, final String checker, final DateTime checkedOnDate,
             final String processingResult, final String commandAsJson, final String officeName, final String groupLevelName,
-            final String groupName, final String clientName, final String loanAccountNo, final String savingsAccountNo,final Long clientId, final Long loanId) {
+            final String groupName, final String clientName, final String loanAccountNo, final String savingsAccountNo,
+            final Long clientId, final Long loanId) {
 
         this.id = id;
         this.actionName = actionName;
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java
index db4aefd70..2a955197d 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java
@@ -5,9 +5,16 @@
  */
 package org.mifosplatform.commands.service;
 
-import com.google.common.reflect.TypeToken;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
+import java.lang.reflect.Type;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.DateTime;
 import org.mifosplatform.commands.data.AuditData;
@@ -41,10 +48,9 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
-import java.lang.reflect.Type;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 @Service
 public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
@@ -52,7 +58,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
     private final static Logger logger = LoggerFactory.getLogger(AuditReadPlatformServiceImpl.class);
     private final static Set<String> supportedOrderByValues = new HashSet<String>(Arrays.asList("id", "actionName", "entityName",
             "resourceId", "subresourceId", "madeOnDate", "checkedOnDate", "officeName", "groupName", "clientName", "loanAccountNo",
-            "savingsAccountNo"));
+            "savingsAccountNo", "clientId", "loanId"));
 
     private final JdbcTemplate jdbcTemplate;
     private final PlatformSecurityContext context;
@@ -120,8 +126,8 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
             final String actionName = rs.getString("actionName");
             final String entityName = rs.getString("entityName");
             final Long resourceId = JdbcSupport.getLong(rs, "resourceId");
-            final Long clientId  = rs.getLong("clientId");
-            final Long loanId    = rs.getLong("loanId");
+            final Long clientId = rs.getLong("clientId");
+            final Long loanId = rs.getLong("loanId");
             final Long subresourceId = JdbcSupport.getLong(rs, "subresourceId");
             final String maker = rs.getString("maker");
             final DateTime madeOnDate = JdbcSupport.getDateTime(rs, "madeOnDate");
@@ -144,7 +150,8 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
             final String savingsAccountNo = rs.getString("savingsAccountNo");
 
             return new AuditData(id, actionName, entityName, resourceId, subresourceId, maker, madeOnDate, checker, checkedOnDate,
-                    processingResult, commandAsJson, officeName, groupLevelName, groupName, clientName, loanAccountNo, savingsAccountNo,clientId,loanId);
+                    processingResult, commandAsJson, officeName, groupLevelName, groupName, clientName, loanAccountNo, savingsAccountNo,
+                    clientId, loanId);
         }
     }