diff --git a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
index ff6594c..da4198e 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
@@ -908,27 +908,29 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 
 	public List<Map<String,Object>> list(Map<String, Object> args){
 		StringBuilder sql = new StringBuilder("SELECT"
-			+ " id, "
-			+ " templateId, "
-			+ " fileId, "
-			+ " created, "
-			+ " modified, "
-            + " version "
-			+ " FROM filled_form "
-			+ " WHERE deleted = FALSE "
+			+ " ff.id, "
+			+ " ff.templateId, "
+			+ " ff.fileId, "
+			+ " ff.created, "
+			+ " ff.modified, "
+            + " ff.version, "
+            + " t.name AS templateName "
+			+ " FROM filled_form ff "
+			+ " LEFT JOIN template t ON t.id = ff.templateId "
+			+ " WHERE ff.deleted = FALSE "
 		);
 
 		if (args != null) {
 			if (args.containsKey("clientId")) 
-				sql.append(" AND clientId = :clientId ");
+				sql.append(" AND ff.clientId = :clientId ");
 			if (args.containsKey("templateId")) 
-				sql.append(" AND templateId = :templateId ");
+				sql.append(" AND ff.templateId = :templateId ");
 			if (args.containsKey("remarks")) 
-				sql.append(" AND remarks LIKE :remarks ");
+				sql.append(" AND ff.remarks LIKE :remarks ");
 			if (args.containsKey("createDateFrom")) 
-				sql.append(" AND created >= :createDateFrom ");
+				sql.append(" AND ff.created >= :createDateFrom ");
 			if (args.containsKey("createDateTo")) 
-				sql.append(" AND created <= :createDateTo ");
+				sql.append(" AND ff.created <= :createDateTo ");
 		}
 		// sql.append(" ORDER BY id desc ");