diff --git a/org.adempiere.base.process/src/org/compiere/process/TabCreateFields.java b/org.adempiere.base.process/src/org/compiere/process/TabCreateFields.java
index 6ee3e406d5..3b2b4fe042 100644
--- a/org.adempiere.base.process/src/org/compiere/process/TabCreateFields.java
+++ b/org.adempiere.base.process/src/org/compiere/process/TabCreateFields.java
@@ -100,11 +100,11 @@ public class TabCreateFields extends SvrProcess
 			+ " AND IsActive='Y' ";
 
 		if(!Util.isEmpty(p_EntityType))
-			sql += " AND c.entitytype = ?";
+			sql += " AND c.entitytype = ? ";
 		if(p_CreatedSince != null)
 			sql += " AND c.created >= ? ";
 
-		sql += "ORDER  BY CASE "
+		sql += " ORDER  BY CASE "
 			+ "            WHEN c.ColumnName = 'AD_Client_ID' THEN -100 "
 			+ "            WHEN c.ColumnName = 'AD_Org_ID' THEN -90 "
 			+ "            WHEN c.IsParent = 'Y' THEN -85 "