diff --git a/migration/i7.1z/oracle/202008171626_IDEMPIERE-4425.sql b/migration/i7.1z/oracle/202008171626_IDEMPIERE-4425.sql
new file mode 100644
index 0000000000..20f2e07653
--- /dev/null
+++ b/migration/i7.1z/oracle/202008171626_IDEMPIERE-4425.sql
@@ -0,0 +1,111 @@
+-- IDEMPIERE-4425 Find Window improvements
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Aug 17, 2020, 11:20:35 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','=',0,0,'Y',TO_DATE('2020-08-17 23:20:34','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:20:34','YYYY-MM-DD HH24:MI:SS'),100,200624,'OPERATOR_EQUAL','D','72e41fa5-1116-4cec-8505-5d1c222c902f')
+;
+
+-- Aug 17, 2020, 11:20:50 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','!=',0,0,'Y',TO_DATE('2020-08-17 23:20:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:20:50','YYYY-MM-DD HH24:MI:SS'),100,200625,'OPERATOR_NOT_EQUAL','D','9902aa45-226a-425c-a830-df1050712499')
+;
+
+-- Aug 17, 2020, 11:21:12 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' ~ ',0,0,'Y',TO_DATE('2020-08-17 23:21:12','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:21:12','YYYY-MM-DD HH24:MI:SS'),100,200626,'OPERATOR_LIKE','D','4f876b14-394a-48bf-9502-701327be1c7e')
+;
+
+-- Aug 17, 2020, 11:21:22 PM CEST
+UPDATE AD_Message SET MsgText=' = ',Updated=TO_DATE('2020-08-17 23:21:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200624
+;
+
+-- Aug 17, 2020, 11:21:33 PM CEST
+UPDATE AD_Message SET MsgText=' != ',Updated=TO_DATE('2020-08-17 23:21:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200625
+;
+
+-- Aug 17, 2020, 11:21:55 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' !~ ',0,0,'Y',TO_DATE('2020-08-17 23:21:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:21:55','YYYY-MM-DD HH24:MI:SS'),100,200627,'OPERATOR_NOT_LIKE','D','a995beb9-80e5-48b4-85e2-0e51fdc17477')
+;
+
+-- Aug 17, 2020, 11:22:13 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' > ',0,0,'Y',TO_DATE('2020-08-17 23:22:13','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:22:13','YYYY-MM-DD HH24:MI:SS'),100,200628,'OPERATOR_GREATER','D','b3403c8f-4ee0-4302-bbeb-ac584862035b')
+;
+
+-- Aug 17, 2020, 11:22:29 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' >= ',0,0,'Y',TO_DATE('2020-08-17 23:22:28','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:22:28','YYYY-MM-DD HH24:MI:SS'),100,200629,'OPERATOR_GREATER_EQUAL','D','494a1506-4473-4ef5-8ea1-34f71a5c0db8')
+;
+
+-- Aug 17, 2020, 11:22:39 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' < ',0,0,'Y',TO_DATE('2020-08-17 23:22:38','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:22:38','YYYY-MM-DD HH24:MI:SS'),100,200630,'OPERATOR_LESS','D','62d7d36c-b8f7-46dd-acaf-ca8c87b3b9f9')
+;
+
+-- Aug 17, 2020, 11:22:48 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' <= ',0,0,'Y',TO_DATE('2020-08-17 23:22:48','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:22:48','YYYY-MM-DD HH24:MI:SS'),100,200631,'OPERATOR_LESS_EQUAL','D','68a2cc4b-7035-4366-834c-f2d7ccc10ff4')
+;
+
+-- Aug 17, 2020, 11:23:04 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' >-< ',0,0,'Y',TO_DATE('2020-08-17 23:23:04','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:23:04','YYYY-MM-DD HH24:MI:SS'),100,200632,'OPERATOR_BETWEEN','D','c8e722cc-42cd-4c69-a746-641f9c073906')
+;
+
+-- Aug 17, 2020, 11:23:22 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' NULL ',0,0,'Y',TO_DATE('2020-08-17 23:23:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:23:21','YYYY-MM-DD HH24:MI:SS'),100,200633,'OPERATOR_NOT_NULL','D','b1dff391-5e9a-4f16-928b-9dce138839cc')
+;
+
+-- Aug 17, 2020, 11:23:35 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' NULL ',0,0,'Y',TO_DATE('2020-08-17 23:23:35','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-08-17 23:23:35','YYYY-MM-DD HH24:MI:SS'),100,200634,'OPERATOR_NULL','D','57a47cb9-c9a0-4b65-b304-f1c8a9e3796d')
+;
+
+-- Aug 17, 2020, 11:23:42 PM CEST
+UPDATE AD_Message SET MsgText=' !NULL ',Updated=TO_DATE('2020-08-17 23:23:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200633
+;
+
+-- Aug 17, 2020, 11:25:50 PM CEST
+UPDATE AD_Message SET MsgText='B',Updated=TO_DATE('2020-08-17 23:25:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200632
+;
+
+-- Aug 17, 2020, 11:26:06 PM CEST
+UPDATE AD_Message SET MsgText=' Between',Updated=TO_DATE('2020-08-17 23:26:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200632
+;
+
+-- Aug 17, 2020, 11:26:22 PM CEST
+UPDATE AD_Message SET MsgText=' =',Updated=TO_DATE('2020-08-17 23:26:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200624
+;
+
+-- Aug 17, 2020, 11:26:29 PM CEST
+UPDATE AD_Message SET MsgText=' >',Updated=TO_DATE('2020-08-17 23:26:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200628
+;
+
+-- Aug 17, 2020, 11:26:32 PM CEST
+UPDATE AD_Message SET MsgText=' >=',Updated=TO_DATE('2020-08-17 23:26:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200629
+;
+
+-- Aug 17, 2020, 11:26:35 PM CEST
+UPDATE AD_Message SET MsgText=' <',Updated=TO_DATE('2020-08-17 23:26:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200630
+;
+
+-- Aug 17, 2020, 11:26:38 PM CEST
+UPDATE AD_Message SET MsgText=' <=',Updated=TO_DATE('2020-08-17 23:26:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200631
+;
+
+-- Aug 17, 2020, 11:26:44 PM CEST
+UPDATE AD_Message SET MsgText=' Like',Updated=TO_DATE('2020-08-17 23:26:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200626
+;
+
+-- Aug 17, 2020, 11:27:10 PM CEST
+UPDATE AD_Message SET MsgText=' Not Equal',Updated=TO_DATE('2020-08-17 23:27:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200625
+;
+
+-- Aug 17, 2020, 11:27:41 PM CEST
+UPDATE AD_Message SET MsgText=' Not Like',Updated=TO_DATE('2020-08-17 23:27:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200627
+;
+
+-- Aug 17, 2020, 11:27:49 PM CEST
+UPDATE AD_Message SET MsgText=' Not Null',Updated=TO_DATE('2020-08-17 23:27:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200633
+;
+
+-- Aug 17, 2020, 11:27:55 PM CEST
+UPDATE AD_Message SET MsgText=' Is Null',Updated=TO_DATE('2020-08-17 23:27:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200634
+;
+
+SELECT register_migration_script('202008171626_IDEMPIERE-4425.sql') FROM dual
+;
+
diff --git a/migration/i7.1z/postgresql/202008171626_IDEMPIERE-4425.sql b/migration/i7.1z/postgresql/202008171626_IDEMPIERE-4425.sql
new file mode 100644
index 0000000000..cc6692f49d
--- /dev/null
+++ b/migration/i7.1z/postgresql/202008171626_IDEMPIERE-4425.sql
@@ -0,0 +1,109 @@
+-- IDEMPIERE-4425 Find Window improvements
+
+-- Aug 17, 2020, 11:20:35 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','=',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:20:34','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:20:34','YYYY-MM-DD HH24:MI:SS'),100,200624,'OPERATOR_EQUAL','D','72e41fa5-1116-4cec-8505-5d1c222c902f')
+;
+
+-- Aug 17, 2020, 11:20:50 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','!=',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:20:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:20:50','YYYY-MM-DD HH24:MI:SS'),100,200625,'OPERATOR_NOT_EQUAL','D','9902aa45-226a-425c-a830-df1050712499')
+;
+
+-- Aug 17, 2020, 11:21:12 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' ~ ',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:21:12','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:21:12','YYYY-MM-DD HH24:MI:SS'),100,200626,'OPERATOR_LIKE','D','4f876b14-394a-48bf-9502-701327be1c7e')
+;
+
+-- Aug 17, 2020, 11:21:22 PM CEST
+UPDATE AD_Message SET MsgText=' = ',Updated=TO_TIMESTAMP('2020-08-17 23:21:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200624
+;
+
+-- Aug 17, 2020, 11:21:33 PM CEST
+UPDATE AD_Message SET MsgText=' != ',Updated=TO_TIMESTAMP('2020-08-17 23:21:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200625
+;
+
+-- Aug 17, 2020, 11:21:55 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' !~ ',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:21:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:21:55','YYYY-MM-DD HH24:MI:SS'),100,200627,'OPERATOR_NOT_LIKE','D','a995beb9-80e5-48b4-85e2-0e51fdc17477')
+;
+
+-- Aug 17, 2020, 11:22:13 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' > ',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:22:13','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:22:13','YYYY-MM-DD HH24:MI:SS'),100,200628,'OPERATOR_GREATER','D','b3403c8f-4ee0-4302-bbeb-ac584862035b')
+;
+
+-- Aug 17, 2020, 11:22:29 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' >= ',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:22:28','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:22:28','YYYY-MM-DD HH24:MI:SS'),100,200629,'OPERATOR_GREATER_EQUAL','D','494a1506-4473-4ef5-8ea1-34f71a5c0db8')
+;
+
+-- Aug 17, 2020, 11:22:39 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' < ',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:22:38','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:22:38','YYYY-MM-DD HH24:MI:SS'),100,200630,'OPERATOR_LESS','D','62d7d36c-b8f7-46dd-acaf-ca8c87b3b9f9')
+;
+
+-- Aug 17, 2020, 11:22:48 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' <= ',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:22:48','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:22:48','YYYY-MM-DD HH24:MI:SS'),100,200631,'OPERATOR_LESS_EQUAL','D','68a2cc4b-7035-4366-834c-f2d7ccc10ff4')
+;
+
+-- Aug 17, 2020, 11:23:04 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' >-< ',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:23:04','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:23:04','YYYY-MM-DD HH24:MI:SS'),100,200632,'OPERATOR_BETWEEN','D','c8e722cc-42cd-4c69-a746-641f9c073906')
+;
+
+-- Aug 17, 2020, 11:23:22 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' NULL ',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:23:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:23:21','YYYY-MM-DD HH24:MI:SS'),100,200633,'OPERATOR_NOT_NULL','D','b1dff391-5e9a-4f16-928b-9dce138839cc')
+;
+
+-- Aug 17, 2020, 11:23:35 PM CEST
+INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I',' NULL ',0,0,'Y',TO_TIMESTAMP('2020-08-17 23:23:35','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-08-17 23:23:35','YYYY-MM-DD HH24:MI:SS'),100,200634,'OPERATOR_NULL','D','57a47cb9-c9a0-4b65-b304-f1c8a9e3796d')
+;
+
+-- Aug 17, 2020, 11:23:42 PM CEST
+UPDATE AD_Message SET MsgText=' !NULL ',Updated=TO_TIMESTAMP('2020-08-17 23:23:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200633
+;
+
+-- Aug 17, 2020, 11:25:50 PM CEST
+UPDATE AD_Message SET MsgText='B',Updated=TO_TIMESTAMP('2020-08-17 23:25:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200632
+;
+
+-- Aug 17, 2020, 11:26:06 PM CEST
+UPDATE AD_Message SET MsgText=' Between',Updated=TO_TIMESTAMP('2020-08-17 23:26:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200632
+;
+
+-- Aug 17, 2020, 11:26:22 PM CEST
+UPDATE AD_Message SET MsgText=' =',Updated=TO_TIMESTAMP('2020-08-17 23:26:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200624
+;
+
+-- Aug 17, 2020, 11:26:29 PM CEST
+UPDATE AD_Message SET MsgText=' >',Updated=TO_TIMESTAMP('2020-08-17 23:26:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200628
+;
+
+-- Aug 17, 2020, 11:26:32 PM CEST
+UPDATE AD_Message SET MsgText=' >=',Updated=TO_TIMESTAMP('2020-08-17 23:26:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200629
+;
+
+-- Aug 17, 2020, 11:26:35 PM CEST
+UPDATE AD_Message SET MsgText=' <',Updated=TO_TIMESTAMP('2020-08-17 23:26:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200630
+;
+
+-- Aug 17, 2020, 11:26:38 PM CEST
+UPDATE AD_Message SET MsgText=' <=',Updated=TO_TIMESTAMP('2020-08-17 23:26:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200631
+;
+
+-- Aug 17, 2020, 11:26:44 PM CEST
+UPDATE AD_Message SET MsgText=' Like',Updated=TO_TIMESTAMP('2020-08-17 23:26:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200626
+;
+
+-- Aug 17, 2020, 11:27:10 PM CEST
+UPDATE AD_Message SET MsgText=' Not Equal',Updated=TO_TIMESTAMP('2020-08-17 23:27:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200625
+;
+
+-- Aug 17, 2020, 11:27:41 PM CEST
+UPDATE AD_Message SET MsgText=' Not Like',Updated=TO_TIMESTAMP('2020-08-17 23:27:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200627
+;
+
+-- Aug 17, 2020, 11:27:49 PM CEST
+UPDATE AD_Message SET MsgText=' Not Null',Updated=TO_TIMESTAMP('2020-08-17 23:27:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200633
+;
+
+-- Aug 17, 2020, 11:27:55 PM CEST
+UPDATE AD_Message SET MsgText=' Is Null',Updated=TO_TIMESTAMP('2020-08-17 23:27:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200634
+;
+
+SELECT register_migration_script('202008171626_IDEMPIERE-4425.sql') FROM dual
+;
+
diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java
index ea32ec506d..fbdd159203 100644
--- a/org.adempiere.base/src/org/compiere/model/MQuery.java
+++ b/org.adempiere.base/src/org/compiere/model/MQuery.java
@@ -49,7 +49,7 @@ public class MQuery implements Serializable, Cloneable
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -1495322773308601375L;
+	private static final long serialVersionUID = -8412818805510431201L;
 
 	/**
 	 *	Get Query from Parameter
@@ -442,73 +442,111 @@ public class MQuery implements Serializable, Cloneable
 	
 	/** Equal 			*/
 	public static final String	EQUAL = "=";
+	public static final String	MSG_EQUAL = "OPERATOR_EQUAL";
 	/** Equal - 0		*/
 	public static final int		EQUAL_INDEX = 0;
 	/** Not Equal		*/
 	public static final String	NOT_EQUAL = "!=";
+	public static final String	MSG_NOT_EQUAL = "OPERATOR_NOT_EQUAL";
 	/** Not Equal - 1		*/
 	public static final int		NOT_EQUAL_INDEX = 1;
 	/** Like			*/
 	public static final String	LIKE = " LIKE ";
+	public static final String	MSG_LIKE = "OPERATOR_LIKE";
 	/** Not Like		*/
 	public static final String	NOT_LIKE = " NOT LIKE ";
+	public static final String	MSG_NOT_LIKE = "OPERATOR_NOT_LIKE";
 	/** Greater			*/
 	public static final String	GREATER = ">";
+	public static final String	MSG_GREATER = "OPERATOR_GREATER";
 	/** Greater Equal	*/
 	public static final String	GREATER_EQUAL = ">=";
+	public static final String	MSG_GREATER_EQUAL = "OPERATOR_GREATER_EQUAL";
 	/** Less			*/
 	public static final String	LESS = "<";
+	public static final String	MSG_LESS = "OPERATOR_LESS";
 	/** Less Equal		*/
 	public static final String	LESS_EQUAL = "<=";
+	public static final String	MSG_LESS_EQUAL = "OPERATOR_LESS_EQUAL";
 	/** Between			*/
 	public static final String	BETWEEN = " BETWEEN ";
+	public static final String	MSG_BETWEEN = "OPERATOR_BETWEEN";
 	/** Between - 8		*/
 	public static final int		BETWEEN_INDEX = 8;
 	/** For IDEMPIERE-377	*/
 	public static final String 	NOT_NULL = " IS NOT NULL ";
+	public static final String 	MSG_NOT_NULL = "OPERATOR_NOT_NULL";
 	/** For IDEMPIERE-377	*/
 	public static final String 	NULL = " IS NULL ";
+	public static final String 	MSG_NULL = "OPERATOR_NULL";
 
-	/**	Operators for Strings				*/
+	/**	All the Operators			*/
 	public static final ValueNamePair[]	OPERATORS = new ValueNamePair[] {
-		new ValueNamePair (EQUAL,			" = "),		//	0 - EQUAL_INDEX
-		new ValueNamePair (NOT_EQUAL,		" != "),	//  1 - NOT_EQUAL_INDEX
-		new ValueNamePair (LIKE,			" ~ "),
-		new ValueNamePair (NOT_LIKE,		" !~ "),
-		new ValueNamePair (GREATER,			" > "),
-		new ValueNamePair (GREATER_EQUAL,	" >= "),
-		new ValueNamePair (LESS,			" < "),
-		new ValueNamePair (LESS_EQUAL,		" <= "),
-		new ValueNamePair (BETWEEN,			" >-< "),	//	8 - BETWEEN_INDEX
-		new ValueNamePair (NULL,			" NULL "),
-		new ValueNamePair (NOT_NULL,		" !NULL ")
+		new ValueNamePair (EQUAL,			MSG_EQUAL),		//	0 - EQUAL_INDEX
+		new ValueNamePair (NOT_EQUAL,		MSG_NOT_EQUAL),	//  1 - NOT_EQUAL_INDEX
+		new ValueNamePair (LIKE,			MSG_LIKE),
+		new ValueNamePair (NOT_LIKE,		MSG_NOT_LIKE),
+		new ValueNamePair (GREATER,			MSG_GREATER),
+		new ValueNamePair (GREATER_EQUAL,	MSG_GREATER_EQUAL),
+		new ValueNamePair (LESS,			MSG_LESS),
+		new ValueNamePair (LESS_EQUAL,		MSG_LESS_EQUAL),
+		new ValueNamePair (BETWEEN,			MSG_BETWEEN),	//	8 - BETWEEN_INDEX
+		new ValueNamePair (NULL,			MSG_NULL),
+		new ValueNamePair (NOT_NULL,		MSG_NOT_NULL)
+	};
+	/**	Operators for Strings				*/
+	public static final ValueNamePair[]	OPERATORS_STRINGS = new ValueNamePair[] {
+		new ValueNamePair (EQUAL,			MSG_EQUAL),
+		new ValueNamePair (NOT_EQUAL,		MSG_NOT_EQUAL),
+		new ValueNamePair (LIKE,			MSG_LIKE),
+		new ValueNamePair (NOT_LIKE,		MSG_NOT_LIKE),
+		new ValueNamePair (GREATER,			MSG_GREATER),
+		new ValueNamePair (GREATER_EQUAL,	MSG_GREATER_EQUAL),
+		new ValueNamePair (LESS,			MSG_LESS),
+		new ValueNamePair (LESS_EQUAL,		MSG_LESS_EQUAL),
+		new ValueNamePair (BETWEEN,			MSG_BETWEEN),
+		new ValueNamePair (NULL,			MSG_NULL),
+		new ValueNamePair (NOT_NULL,		MSG_NOT_NULL)
 	};
 	/**	Operators for Lookups and Lists	(including Y/N)				*/
 	public static final ValueNamePair[]	OPERATORS_LOOKUP = new ValueNamePair[] {
-		new ValueNamePair (EQUAL,			" = "),
-		new ValueNamePair (NOT_EQUAL,		" != "),
-		new ValueNamePair (NULL,			" NULL "),
-		new ValueNamePair (NOT_NULL,		" !NULL ")
+		new ValueNamePair (EQUAL,			MSG_EQUAL),
+		new ValueNamePair (NOT_EQUAL,		MSG_NOT_EQUAL),
+		new ValueNamePair (NULL,			MSG_NULL),
+		new ValueNamePair (NOT_NULL,		MSG_NOT_NULL)
 	};
 	/**	Operators for encrypted fields								*/
 	public static final ValueNamePair[]	OPERATORS_ENCRYPTED = new ValueNamePair[] {
-		new ValueNamePair (NULL,			" NULL "),
-		new ValueNamePair (NOT_NULL,		" !NULL ")
+		new ValueNamePair (NULL,			MSG_NULL),
+		new ValueNamePair (NOT_NULL,		MSG_NOT_NULL)
 	};
 
-	/**	Operators for Numbers, Dates, Integers	*/
+	/**	Operators for Numbers, Integers	*/
 	public static final ValueNamePair[]	OPERATORS_NUMBERS = new ValueNamePair[] {
-		new ValueNamePair (EQUAL,			" = "),
-		new ValueNamePair (NOT_EQUAL,		" != "),
-		new ValueNamePair (GREATER,			" > "),
-		new ValueNamePair (GREATER_EQUAL,	" >= "),
-		new ValueNamePair (LESS,			" < "),
-		new ValueNamePair (LESS_EQUAL,		" <= "),
-		new ValueNamePair (BETWEEN,			" >-< "),
-		new ValueNamePair (NULL,			" NULL "),
-		new ValueNamePair (NOT_NULL,		" !NULL ")
+		new ValueNamePair (EQUAL,			MSG_EQUAL),
+		new ValueNamePair (NOT_EQUAL,		MSG_NOT_EQUAL),
+		new ValueNamePair (GREATER,			MSG_GREATER),
+		new ValueNamePair (GREATER_EQUAL,	MSG_GREATER_EQUAL),
+		new ValueNamePair (LESS,			MSG_LESS),
+		new ValueNamePair (LESS_EQUAL,		MSG_LESS_EQUAL),
+		new ValueNamePair (BETWEEN,			MSG_BETWEEN),
+		new ValueNamePair (NULL,			MSG_NULL),
+		new ValueNamePair (NOT_NULL,		MSG_NOT_NULL)
 	};
 	
+	/**	Operators for Dates	*/
+	public static final ValueNamePair[]	OPERATORS_DATES = new ValueNamePair[] {
+		new ValueNamePair (EQUAL,			MSG_EQUAL),
+		new ValueNamePair (NOT_EQUAL,		MSG_NOT_EQUAL),
+		new ValueNamePair (GREATER,			MSG_GREATER),
+		new ValueNamePair (GREATER_EQUAL,	MSG_GREATER_EQUAL),
+		new ValueNamePair (LESS,			MSG_LESS),
+		new ValueNamePair (LESS_EQUAL,		MSG_LESS_EQUAL),
+		new ValueNamePair (BETWEEN,			MSG_BETWEEN),
+		new ValueNamePair (NULL,			MSG_NULL),
+		new ValueNamePair (NOT_NULL,		MSG_NOT_NULL)
+	};
+
 	/*************************************************************************
 	 * 	Add Restriction
 	 * 	@param ColumnName ColumnName
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
index ac4b6900e9..77dd73301c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
@@ -131,7 +131,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 2958810511464597943L;
+	private static final long serialVersionUID = -3907408033854720147L;
 
 	private static final String FIND_ROW_EDITOR = "find.row.editor";
 
@@ -1114,7 +1114,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
         	listColumn.setSelectedIndex(0);
 
             for (ValueNamePair item: op)
-                listOperator.appendItem(item.getName(), item.getValue());
+                listOperator.appendItem(Msg.getMsg(Env.getCtx(), item.getName()), item.getValue());
             listOperator.setSelectedIndex(0);
         }
         else
@@ -1132,6 +1132,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
             	{
                 	listColumn.setSelectedItem(li);
             		selected = true;
+            		break;
             	}
             }
             if(!selected) listColumn.setSelectedIndex(0);
@@ -1140,11 +1141,12 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
             for (int i = 0; i < op.length; i++)
             {
             	ValueNamePair item = op[i];
-            	ListItem li = listOperator.appendItem(item.getName(), item.getValue());
+            	ListItem li = listOperator.appendItem(Msg.getMsg(Env.getCtx(), item.getName()), item.getValue());
             	if(item.getValue().equals(operator))
             	{
             		listOperator.setSelectedItem(li);
             		selected = true;
+            		break;
             	}
             }
             if(!selected) listOperator.setSelectedIndex(0);
@@ -1555,7 +1557,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 	 * 	@param in value
 	 * @param to
 	 * @param listItem
-	 * 	@return data type corected value
+	 * 	@return data type corrected value
 	 */
 	private Component parseString(GridField field, String in, ListItem listItem, boolean to)
 	{
@@ -1719,7 +1721,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 	            Object parsedValue = parseValue(field, value);
 	            if (parsedValue == null)
 	                continue;
-	            String infoDisplay = value.toString();
+	            String infoDisplay = (value == null ? "" : value.toString());
 	            if (field.isLookup())
 	                infoDisplay = field.getLookup().getDisplay(value);
 	            else if (field.getDisplayType() == DisplayType.YesNo)
@@ -1776,7 +1778,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 	            	m_query.addRestriction(ColumnSQL, Operator, parsedValue,
 	            			infoName, infoDisplay, and, openBrackets);
 
-	            appendCode(code, ColumnName, Operator, value.toString(), value2 != null ? value2.toString() : "", andOr, lBrackets, rBrackets);
+	            appendCode(code, ColumnName, Operator, value != null ? value.toString() : "", value2 != null ? value2.toString() : "", andOr, lBrackets, rBrackets);
 	        }
 	        
 	        saveQuery(saveQuery, code, shareAllUsers);			
@@ -2092,14 +2094,17 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
         	addOperators(MQuery.OPERATORS_LOOKUP, listOperator);
         }
         else if (DisplayType.isNumeric(referenceType)
-        		|| DisplayType.isDate(referenceType)
         		|| DisplayType.isID(referenceType)) // Note that lookups were filtered above
         {
         	addOperators(MQuery.OPERATORS_NUMBERS, listOperator);
         }
+        else if (DisplayType.isDate(referenceType))
+        {
+        	addOperators(MQuery.OPERATORS_DATES, listOperator);
+        }
         else // DisplayType.isText
         {
-        	addOperators(MQuery.OPERATORS, listOperator);
+        	addOperators(MQuery.OPERATORS_STRINGS, listOperator);
         }
     } //    addOperators
 
@@ -2113,7 +2118,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
         itemList.clear();
         for (ValueNamePair item: op)
         {
-            listOperator.appendItem(item.getName(), item.getValue());
+            listOperator.appendItem(Msg.getMsg(Env.getCtx(), item.getName()), item.getValue());
         }
         listOperator.setSelectedIndex(0);
     }   //  addOperators