diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml
index ff27434c..d88fc240 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml
@@ -22,7 +22,7 @@
     
 	
 	
-	<select id="queryPageResults" parameterType="Accounts" resultType="Accounts">
+	<select id="fetchPageResults" parameterType="Accounts" resultType="Accounts">
 		select
 			*
 		from
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsStrategyMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsStrategyMapper.xml
index 32336f2f..d8e533e2 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsStrategyMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsStrategyMapper.xml
@@ -16,7 +16,7 @@
     
     
     
-    <select id="queryPageResults" parameterType="AccountsStrategy" resultType="AccountsStrategy">
+    <select id="fetchPageResults" parameterType="AccountsStrategy" resultType="AccountsStrategy">
         select
             mas.*,
             ma.icon appicon
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsAdaptersMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsAdaptersMapper.xml
index 34526218..f8d92c96 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsAdaptersMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsAdaptersMapper.xml
@@ -16,7 +16,7 @@
     
 	
 	
-	<select id="queryPageResults" parameterType="AppsAdapters" resultType="AppsAdapters">
+	<select id="fetchPageResults" parameterType="AppsAdapters" resultType="AppsAdapters">
 		select
 			*
 		from
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ConnectorsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ConnectorsMapper.xml
index 0e126421..ab582043 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ConnectorsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ConnectorsMapper.xml
@@ -11,7 +11,7 @@
 		</if>
     </sql>
     	
-	<select id="queryPageResults" parameterType="Connectors" resultType="Connectors">
+	<select id="fetchPageResults" parameterType="Connectors" resultType="Connectors">
 		select
 			*
 		from
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryConnectorMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryConnectorMapper.xml
index b275f377..ccf3f923 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryConnectorMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryConnectorMapper.xml
@@ -45,7 +45,7 @@
     </sql>
 	
     
-     <select id="queryPageResults" parameterType="HistoryConnector" resultType="HistoryConnector">
+     <select id="fetchPageResults" parameterType="HistoryConnector" resultType="HistoryConnector">
     	select 
 			*
     	from mxk_history_connector 
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml
index 98215cad..b770cb92 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml
@@ -33,7 +33,7 @@
 		
     </sql>
     
-     <select id="queryPageResults" parameterType="HistoryLoginApps" resultType="HistoryLoginApps">
+     <select id="fetchPageResults" parameterType="HistoryLoginApps" resultType="HistoryLoginApps">
     	select 
 			id,
 			sessionid,
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml
index cbd07e5f..12d273ba 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml
@@ -38,7 +38,7 @@
 	
    
     
-     <select id="queryPageResults" parameterType="HistoryLogin" resultType="HistoryLogin">
+     <select id="fetchPageResults" parameterType="HistoryLogin" resultType="HistoryLogin">
     	select 
 			id,
 	   		sessionid,
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistorySynchronizerMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistorySynchronizerMapper.xml
index e546218d..a6218d7b 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistorySynchronizerMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistorySynchronizerMapper.xml
@@ -24,7 +24,7 @@
     </sql>
 	
     
-     <select id="queryPageResults" parameterType="HistorySynchronizer" resultType="HistorySynchronizer">
+     <select id="fetchPageResults" parameterType="HistorySynchronizer" resultType="HistorySynchronizer">
     	select 
 			*
     	from mxk_history_synchronizer 
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistorySystemLogsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistorySystemLogsMapper.xml
index 0b478c33..8720678c 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistorySystemLogsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistorySystemLogsMapper.xml
@@ -30,7 +30,7 @@
     </sql>
 	
     
-     <select id="queryPageResults" parameterType="HistorySystemLogs" resultType="HistorySystemLogs">
+     <select id="fetchPageResults" parameterType="HistorySystemLogs" resultType="HistorySystemLogs">
     	select *
     	from mxk_history_system_logs 
     	where	instid   =   #{instId} 
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml
index 46c16f56..41aa4a12 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml
@@ -30,7 +30,7 @@
     </select>
     
     
-   <select id="queryPageResults" parameterType="Organizations" resultType="Organizations">
+   <select id="fetchPageResults" parameterType="Organizations" resultType="Organizations">
     	select 
 			*
     	from mxk_organizations 
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml
index 703d310e..29648f68 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml
@@ -19,7 +19,7 @@
     
 	
 	
-	<select id="queryPageResults" parameterType="Resources" resultType="Resources">
+	<select id="fetchPageResults" parameterType="Resources" resultType="Resources">
 		select
 			res.*,app.appname
 		from
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml
index c77bb053..d83b61ef 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml
@@ -13,7 +13,7 @@
     
 	
 	
-	<select id="queryPageResults" parameterType="Roles" resultType="Roles">
+	<select id="fetchPageResults" parameterType="Roles" resultType="Roles">
 		select
 			*
 		from
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/SocialsProviderMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/SocialsProviderMapper.xml
index b27c6993..2cef7ff8 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/SocialsProviderMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/SocialsProviderMapper.xml
@@ -13,7 +13,7 @@
     
 	
 	
-	<select id="queryPageResults" parameterType="SocialsProvider" resultType="SocialsProvider">
+	<select id="fetchPageResults" parameterType="SocialsProvider" resultType="SocialsProvider">
 		select
 			*
 		from
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/SynchronizersMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/SynchronizersMapper.xml
index cf71ab81..2deb409d 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/SynchronizersMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/SynchronizersMapper.xml
@@ -11,7 +11,7 @@
 		</if>
     </sql>
     	
-	<select id="queryPageResults" parameterType="Synchronizers" resultType="Synchronizers">
+	<select id="fetchPageResults" parameterType="Synchronizers" resultType="Synchronizers">
 		select
 			*
 		from
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml
index 9078507c..1a9cfafb 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml
@@ -13,7 +13,7 @@
     
 
 	
-	<select id="queryPageResults" parameterType="UserInfoAdjoint" resultType="UserInfoAdjoint">
+	<select id="fetchPageResults" parameterType="UserInfoAdjoint" resultType="UserInfoAdjoint">
 		select
 			*
 		from
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml
index 65907b40..aa2d089a 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.maxkey.persistence.mapper.UserInfoMapper">
     
-	<select id="queryPageResults" parameterType="UserInfo" resultType="UserInfo">
+	<select id="fetchPageResults" parameterType="UserInfo" resultType="UserInfo">
 		select
 			id,
 			username,