diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml
index 9d6944eda..4d4b01eb8 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml
@@ -7,8 +7,7 @@
     	from 
     		mxk_apps_cas_details cd,
     		mxk_apps app
-    	where 	app.instid = #{instId}
-            and cd.instid = #{instId}
+    	where 	app.instid = cd.instid
     		and app.status	=	1
     		and cd.id	=	app.id
     		and (
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml
index c2f71ac1c..498d7b5a3 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml
@@ -8,8 +8,7 @@
     	from 
     		mxk_apps_form_based_details fbd,
     		mxk_apps app
-    	where 	app.instId = #{instId}
-    	    and fbd.instId = #{instId}
+    	where 	app.instId = fbd.instId
     		and app.id	=	#{value}
     		and fbd.id	=	#{value}
     		and fbd.id	=	app.id
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsJwtDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsJwtDetailsMapper.xml
index 7ceb9658d..6d2488e6e 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsJwtDetailsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsJwtDetailsMapper.xml
@@ -8,8 +8,7 @@
     	from 
     		mxk_apps_jwt_details jd,
     		mxk_apps app
-    	where 	app.instid  =   #{instId} 
-            and jd.instid   =   #{instId} 
+    	where 	app.instid  =   jd.instid
     		and app.id	    =	#{value}
     		and jd.id	    =	#{value}
     		and status        =   1
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml
index db1e53fdb..dd7151ab5 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml
@@ -24,8 +24,7 @@
     	from 
     		mxk_apps_saml_v20_details svd,
     		mxk_apps app
-    	where 	app.instid  =   #{instId} 
-    	    and svd.instid  =   #{instId} 
+    	where 	app.instid  =  svd.instid
     		and app.id		=	#{value}
     		and svd.id		=	#{value}
     		and svd.id		=	app.id
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml
index 62cbccc7a..3b4e62240 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml
@@ -8,8 +8,7 @@
     	from 
     		mxk_apps_token_based_details tbd,
     		mxk_apps app
-    	where 	app.instid  =   #{instId} 
-            and tbd.instid  =   #{instId} 
+    	where 	app.instid  =  tbd.instid
     		and app.id	=	#{value}
     		and tbd.id	=	#{value}
     		and tbd.id	=	app.id