diff --git a/config/alfresco/ibatis/alfresco-SqlMapConfig.xml b/config/alfresco/ibatis/alfresco-SqlMapConfig.xml
index 7e399e482d..4b526d63d4 100644
--- a/config/alfresco/ibatis/alfresco-SqlMapConfig.xml
+++ b/config/alfresco/ibatis/alfresco-SqlMapConfig.xml
@@ -1,21 +1,173 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!DOCTYPE sqlMapConfig      
-    PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN"      
-    "http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
+<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
 
-<sqlMapConfig>
+<configuration>
 
+<!--
+Inbound settings from iBatis
     <settings
-            useStatementNamespaces="true"
-            forceMultipleResultSetSupport="false"
-            lazyLoadingEnabled="false"
-            enhancementEnabled="false"
-            maxTransactions="500"
-            maxSessions="500"
-    />
-    
-    
-    <typeHandler javaType="java.io.Serializable" jdbcType="BLOB" callback="org.alfresco.ibatis.SerializableTypeHandlerCallback"/>
+    lazyLoadingEnabled="false"
+    enhancementEnabled="false"
+    maxTransactions="500"
+    maxSessions="500"
+    /> 
+ -->
+
+    <typeAliases>
         
-</sqlMapConfig>
\ No newline at end of file
+        <!-- AppliedPatch -->
+        
+        <typeAlias alias="AppliedPatch" type="org.alfresco.repo.domain.patch.AppliedPatchEntity"/>
+        
+         <!-- Audit -->
+        <typeAlias alias="AuditModel" type="org.alfresco.repo.domain.audit.AuditModelEntity"/>
+        <typeAlias alias="AuditApplication" type="org.alfresco.repo.domain.audit.AuditApplicationEntity"/>
+        <typeAlias alias="AuditEntry" type="org.alfresco.repo.domain.audit.AuditEntryEntity"/>
+        <typeAlias alias="AuditDeleteParameters" type="org.alfresco.repo.domain.audit.AuditDeleteParameters"/>
+        <typeAlias alias="AuditQueryParameters" type="org.alfresco.repo.domain.audit.AuditQueryParameters"/>
+        <typeAlias alias="AuditQueryResult" type="org.alfresco.repo.domain.audit.AuditQueryResult"/>
+        
+        <!-- Content -->
+        
+        <typeAlias alias="Mimetype" type="org.alfresco.repo.domain.mimetype.MimetypeEntity"/>
+        <typeAlias alias="Encoding" type="org.alfresco.repo.domain.encoding.EncodingEntity"/>
+        <typeAlias alias="ContentUrl" type="org.alfresco.repo.domain.contentdata.ContentUrlEntity"/>
+        <typeAlias alias="ContentUrlUpdate" type="org.alfresco.repo.domain.contentdata.ContentUrlUpdateEntity"/>
+        <typeAlias alias="ContentData" type="org.alfresco.repo.domain.contentdata.ContentDataEntity"/>
+        <typeAlias alias="ContentUrlOrphanQuery" type="org.alfresco.repo.domain.contentdata.ContentUrlOrphanQuery"/>
+        <typeAlias alias="Ids" type="org.alfresco.ibatis.IdsEntity"/>
+        
+        <!-- Locale -->
+        
+        <typeAlias alias="Locale" type="org.alfresco.repo.domain.locale.LocaleEntity"/>
+        
+        <!-- Locks -->
+        
+        <typeAlias alias="LockResource" type="org.alfresco.repo.domain.locks.LockResourceEntity"/>
+        <typeAlias alias="Lock" type="org.alfresco.repo.domain.locks.LockEntity"/>
+        
+        <!-- Node -->
+        
+        <typeAlias alias="Server" type="org.alfresco.repo.domain.node.ServerEntity"/>
+        <typeAlias alias="Transaction" type="org.alfresco.repo.domain.node.TransactionEntity"/>
+        <typeAlias alias="TransactionQuery" type="org.alfresco.repo.domain.node.TransactionQueryEntity"/>
+        <typeAlias alias="Store" type="org.alfresco.repo.domain.node.StoreEntity"/>
+        <typeAlias alias="Node" type="org.alfresco.repo.domain.node.NodeEntity"/>
+        <typeAlias alias="NodeBatchLoad" type="org.alfresco.repo.domain.node.ibatis.NodeBatchLoadEntity"/>
+        <typeAlias alias="NodeUpdate" type="org.alfresco.repo.domain.node.NodeUpdateEntity"/>
+        <typeAlias alias="AuditProps" type="org.alfresco.repo.domain.node.AuditablePropertiesEntity"/>
+        <typeAlias alias="NodePropertyKey" type="org.alfresco.repo.domain.node.NodePropertyKey"/>
+        <typeAlias alias="NodePropertyValue" type="org.alfresco.repo.domain.node.NodePropertyValue"/>
+        <typeAlias alias="NodeProperty" type="org.alfresco.repo.domain.node.NodePropertyEntity"/>
+        <typeAlias alias="NodeAspects" type="org.alfresco.repo.domain.node.NodeAspectsEntity"/>
+        <typeAlias alias="NodeAssoc" type="org.alfresco.repo.domain.node.NodeAssocEntity"/>
+        <typeAlias alias="ChildAssoc" type="org.alfresco.repo.domain.node.ChildAssocEntity"/>
+        <typeAlias alias="ChildProperty" type="org.alfresco.repo.domain.node.ChildPropertyEntity"/>
+        <typeAlias alias="PrimaryChildrenAclUpdate" type="org.alfresco.repo.domain.node.PrimaryChildrenAclUpdateEntity"/>
+        
+        <!-- Patch -->
+        
+        <typeAlias alias="Ids" type="org.alfresco.ibatis.IdsEntity"/>
+        <typeAlias alias="SizeCurrentParams" type="org.alfresco.repo.domain.patch.ibatis.SizeCurrentParams"/>
+        <typeAlias alias="DuplicateEntry" type="org.alfresco.repo.admin.patch.impl.DuplicateEntry" />
+        
+        <!-- Permissions -->
+        
+        <typeAlias alias="Acl" type="org.alfresco.repo.domain.permissions.AclEntity"/>
+        <typeAlias alias="AclMember" type="org.alfresco.repo.domain.permissions.AclMemberEntity"/>
+        <typeAlias alias="AclChangeSet" type="org.alfresco.repo.domain.permissions.AclChangeSetEntity"/>
+        <typeAlias alias="Ace" type="org.alfresco.repo.domain.permissions.AceEntity"/>
+        <typeAlias alias="AceContext" type="org.alfresco.repo.domain.permissions.AceContextEntity"/>
+        <typeAlias alias="Permission" type="org.alfresco.repo.domain.permissions.PermissionEntity"/>
+        <typeAlias alias="Authority" type="org.alfresco.repo.domain.permissions.AuthorityEntity"/>
+        <typeAlias alias="AuthorityAlias" type="org.alfresco.repo.domain.permissions.AuthorityAliasEntity"/>
+        
+        <!-- PropVal -->
+        
+        <typeAlias alias="PropertyClass" type="org.alfresco.repo.domain.propval.PropertyClassEntity"/>
+        <typeAlias alias="PropertyDateValue" type="org.alfresco.repo.domain.propval.PropertyDateValueEntity"/>
+        <typeAlias alias="PropertyStringValue" type="org.alfresco.repo.domain.propval.PropertyStringValueEntity"/>
+        <typeAlias alias="PropertyStringQuery" type="org.alfresco.repo.domain.propval.PropertyStringQueryEntity"/>
+        <typeAlias alias="PropertyDoubleValue" type="org.alfresco.repo.domain.propval.PropertyDoubleValueEntity"/>
+        <typeAlias alias="PropertySerializableValue" type="org.alfresco.repo.domain.propval.PropertySerializableValueEntity"/>
+        <typeAlias alias="PropertyValue" type="org.alfresco.repo.domain.propval.PropertyValueEntity"/>
+        <typeAlias alias="PropertyRoot" type="org.alfresco.repo.domain.propval.PropertyRootEntity"/>
+        <typeAlias alias="PropertyLink" type="org.alfresco.repo.domain.propval.PropertyLinkEntity"/>
+        <typeAlias alias="PropertyUniqueContext" type="org.alfresco.repo.domain.propval.PropertyUniqueContextEntity"/>
+        <typeAlias alias="PropertyIdSearchRow" type="org.alfresco.repo.domain.propval.PropertyIdSearchRow"/>
+        <typeAlias alias="PropertyIdQueryResult" type="org.alfresco.repo.domain.propval.PropertyIdQueryResult"/>
+        <typeAlias alias="PropertyIdQueryParameter" type="org.alfresco.repo.domain.propval.PropertyIdQueryParameter"/>
+        
+        <!-- QName -->
+        
+        <typeAlias alias="Namespace" type="org.alfresco.repo.domain.qname.NamespaceEntity"/>
+        <typeAlias alias="QName" type="org.alfresco.repo.domain.qname.QNameEntity"/>
+        
+        <!-- SOLR -->
+        
+        <typeAlias alias="SOLRTransaction" type="org.alfresco.repo.domain.solr.TransactionEntity"/>
+        <typeAlias alias="Node" type="org.alfresco.repo.domain.node.NodeEntity"/>
+        <typeAlias alias="SOLRTransactionParameters" type="org.alfresco.repo.domain.solr.SOLRTransactionParameters"/>
+        <typeAlias alias="NodeParameters" type="org.alfresco.repo.domain.solr.NodeParameters"/>
+        
+        <!-- Usage -->
+        
+        <typeAlias alias="UsageDelta" type="org.alfresco.repo.domain.usage.UsageDeltaEntity"/>
+        
+        <!-- AVM -->
+        
+        <typeAlias alias="AVMStore" type="org.alfresco.repo.domain.avm.AVMStoreEntity"/>
+        <typeAlias alias="AVMNode" type="org.alfresco.repo.domain.avm.AVMNodeEntity"/>
+        <typeAlias alias="AVMNodeAspect" type="org.alfresco.repo.domain.avm.AVMAspectEntity"/>
+        <typeAlias alias="AVMChildEntry" type="org.alfresco.repo.domain.avm.AVMChildEntryEntity"/>
+        <typeAlias alias="AVMVersionRoot" type="org.alfresco.repo.domain.avm.AVMVersionRootEntity"/>
+        <typeAlias alias="AVMHistoryLink" type="org.alfresco.repo.domain.avm.AVMHistoryLinkEntity"/>
+        <typeAlias alias="AVMMergeLink" type="org.alfresco.repo.domain.avm.AVMMergeLinkEntity"/>
+        <typeAlias alias="AVMVersionLayeredNodeEntry" type="org.alfresco.repo.domain.avm.AVMVersionLayeredNodeEntryEntity"/>
+        <typeAlias alias="AVMStoreProperty" type="org.alfresco.repo.domain.avm.AVMStorePropertyEntity"/>
+        <typeAlias alias="AVMNodeProperty" type="org.alfresco.repo.domain.avm.AVMNodePropertyEntity"/>
+        <typeAlias alias="IdListOfIdsParam" type="org.alfresco.repo.domain.patch.ibatis.IdListOfIdsParam"/>
+        
+        <!-- Canned Queries -->
+        
+        <typeAlias alias="TestOne" type="org.alfresco.repo.domain.query.CannedQueryDAOTest$TestOneParams"/>
+        <typeAlias alias="Ids" type="org.alfresco.ibatis.IdsEntity"/>
+        
+    </typeAliases>
+    
+    <typeHandlers> 
+        <typeHandler javaType="java.io.Serializable" jdbcType="BLOB" handler="org.alfresco.ibatis.SerializableTypeHandler"/>
+    </typeHandlers>
+        
+    <mappers>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/appliedpatch-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/audit-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/audit-insert-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/qname-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/qname-insert-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/locale-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/locale-insert-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/locks-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/locks-insert-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/content-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/content-insert-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/node-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/node-update-acl-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/node-insert-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/patch-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/permissions-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/permissions-insert-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/propval-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/propval-insert-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/solr-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/usage-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/usage-insert-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/avm-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/avm-insert-SqlMap.xml"/>
+        <!-- Canned queries -->
+        <mapper resource="alfresco/ibatis/#resource.dialect#/query-test-common-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/query-usages-common-SqlMap.xml"/>
+    </mappers>
+    
+</configuration>
\ No newline at end of file
diff --git a/config/alfresco/ibatis/ibatis-context.xml b/config/alfresco/ibatis/ibatis-context.xml
index d58d4948dc..84f0880a84 100644
--- a/config/alfresco/ibatis/ibatis-context.xml
+++ b/config/alfresco/ibatis/ibatis-context.xml
@@ -62,7 +62,7 @@
         <property name="resourceLoader" ref="dialectResourceLoader"/>
         <property name="dataSource" ref="dataSource"/>
         <property name="configLocation">
-            <value>classpath:alfresco/ibatis/repo-SqlMapConfig.xml</value>
+            <value>classpath:alfresco/ibatis/alfresco-SqlMapConfig.xml</value>
         </property>
     </bean>
     
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
index 98b3b4579c..9d37766315 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
@@ -238,7 +238,7 @@
       ]]>
    </delete>
    
-   <select id="select_activity_posts" parameterType="ActivityPost" resultType="ActivityPost">
+   <select id="select_activity_posts_by_params" parameterType="ActivityPost" resultType="ActivityPost">
       <![CDATA[
       select 
          sequence_id as id,
@@ -260,7 +260,7 @@
       ]]>
    </select>
    
-   <select id="select_activity_posts_by_status_only" parameterType="ActivityPost" resultType="ActivityPost">
+   <select id="select_activity_posts_by_status" parameterType="ActivityPost" resultType="ActivityPost">
       <![CDATA[
       select 
          sequence_id as id,
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
index ae80efa586..16c2f3d2e1 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
@@ -1037,7 +1037,7 @@
             avm_child_entries
         where
             parent_id = #{parentNodeId} and
-            lower(name) = lower(#name#) and
+            lower(name) = lower(#{name}) and
             child_id = #{childNodeId#
     </delete>
     -->
@@ -1177,7 +1177,7 @@
     
     <!-- For patches -->
     
-    <select id="select_AVMNodeEntitiesCountWhereNewInStore">
+    <select id="select_AVMNodeEntitiesCountWhereNewInStore" resultType="long">
         select 
             count(*)
         from 
diff --git a/config/alfresco/ibatis/repo-SqlMapConfig.xml b/config/alfresco/ibatis/repo-SqlMapConfig.xml
deleted file mode 100644
index 1d0187cad1..0000000000
--- a/config/alfresco/ibatis/repo-SqlMapConfig.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
-
-<configuration>
-
-    <typeAliases>
-        
-        <!-- AppliedPatch -->
-        
-        <typeAlias alias="AppliedPatch" type="org.alfresco.repo.domain.patch.AppliedPatchEntity"/>
-        
-         <!-- Audit -->
-        <typeAlias alias="AuditModel" type="org.alfresco.repo.domain.audit.AuditModelEntity"/>
-        <typeAlias alias="AuditApplication" type="org.alfresco.repo.domain.audit.AuditApplicationEntity"/>
-        <typeAlias alias="AuditEntry" type="org.alfresco.repo.domain.audit.AuditEntryEntity"/>
-        <typeAlias alias="AuditDeleteParameters" type="org.alfresco.repo.domain.audit.AuditDeleteParameters"/>
-        <typeAlias alias="AuditQueryParameters" type="org.alfresco.repo.domain.audit.AuditQueryParameters"/>
-        <typeAlias alias="AuditQueryResult" type="org.alfresco.repo.domain.audit.AuditQueryResult"/>
-        
-        <!-- Content -->
-        
-        <typeAlias alias="Mimetype" type="org.alfresco.repo.domain.mimetype.MimetypeEntity"/>
-        <typeAlias alias="Encoding" type="org.alfresco.repo.domain.encoding.EncodingEntity"/>
-        <typeAlias alias="ContentUrl" type="org.alfresco.repo.domain.contentdata.ContentUrlEntity"/>
-        <typeAlias alias="ContentUrlUpdate" type="org.alfresco.repo.domain.contentdata.ContentUrlUpdateEntity"/>
-        <typeAlias alias="ContentData" type="org.alfresco.repo.domain.contentdata.ContentDataEntity"/>
-        <typeAlias alias="ContentUrlOrphanQuery" type="org.alfresco.repo.domain.contentdata.ContentUrlOrphanQuery"/>
-        <typeAlias alias="Ids" type="org.alfresco.ibatis.IdsEntity"/>
-        
-        <!-- Locale -->
-        
-        <typeAlias alias="Locale" type="org.alfresco.repo.domain.locale.LocaleEntity"/>
-        
-        <!-- Locks -->
-        
-        <typeAlias alias="LockResource" type="org.alfresco.repo.domain.locks.LockResourceEntity"/>
-        <typeAlias alias="Lock" type="org.alfresco.repo.domain.locks.LockEntity"/>
-        
-        <!-- Node -->
-        
-        <typeAlias alias="Server" type="org.alfresco.repo.domain.node.ServerEntity"/>
-        <typeAlias alias="Transaction" type="org.alfresco.repo.domain.node.TransactionEntity"/>
-        <typeAlias alias="TransactionQuery" type="org.alfresco.repo.domain.node.TransactionQueryEntity"/>
-        <typeAlias alias="Store" type="org.alfresco.repo.domain.node.StoreEntity"/>
-        <typeAlias alias="Node" type="org.alfresco.repo.domain.node.NodeEntity"/>
-        <typeAlias alias="NodeBatchLoad" type="org.alfresco.repo.domain.node.ibatis.NodeBatchLoadEntity"/>
-        <typeAlias alias="NodeUpdate" type="org.alfresco.repo.domain.node.NodeUpdateEntity"/>
-        <typeAlias alias="AuditProps" type="org.alfresco.repo.domain.node.AuditablePropertiesEntity"/>
-        <typeAlias alias="NodePropertyKey" type="org.alfresco.repo.domain.node.NodePropertyKey"/>
-        <typeAlias alias="NodePropertyValue" type="org.alfresco.repo.domain.node.NodePropertyValue"/>
-        <typeAlias alias="NodeProperty" type="org.alfresco.repo.domain.node.NodePropertyEntity"/>
-        <typeAlias alias="NodeAspects" type="org.alfresco.repo.domain.node.NodeAspectsEntity"/>
-        <typeAlias alias="NodeAssoc" type="org.alfresco.repo.domain.node.NodeAssocEntity"/>
-        <typeAlias alias="ChildAssoc" type="org.alfresco.repo.domain.node.ChildAssocEntity"/>
-        <typeAlias alias="ChildProperty" type="org.alfresco.repo.domain.node.ChildPropertyEntity"/>
-        <typeAlias alias="PrimaryChildrenAclUpdate" type="org.alfresco.repo.domain.node.PrimaryChildrenAclUpdateEntity"/>
-        
-        <!-- Patch -->
-        
-        <typeAlias alias="Ids" type="org.alfresco.ibatis.IdsEntity"/>
-        <typeAlias alias="DuplicateEntry" type="org.alfresco.repo.admin.patch.impl.DuplicateEntry" />
-        <typeAlias alias="SizeCurrentParams" type="org.alfresco.repo.domain.patch.ibatis.SizeCurrentParams"/>
-        
-        <!-- Permissions -->
-        
-        <typeAlias alias="Acl" type="org.alfresco.repo.domain.permissions.AclEntity"/>
-        <typeAlias alias="AclMember" type="org.alfresco.repo.domain.permissions.AclMemberEntity"/>
-        <typeAlias alias="AclChangeSet" type="org.alfresco.repo.domain.permissions.AclChangeSetEntity"/>
-        <typeAlias alias="Ace" type="org.alfresco.repo.domain.permissions.AceEntity"/>
-        <typeAlias alias="AceContext" type="org.alfresco.repo.domain.permissions.AceContextEntity"/>
-        <typeAlias alias="Permission" type="org.alfresco.repo.domain.permissions.PermissionEntity"/>
-        <typeAlias alias="Authority" type="org.alfresco.repo.domain.permissions.AuthorityEntity"/>
-        <typeAlias alias="AuthorityAlias" type="org.alfresco.repo.domain.permissions.AuthorityAliasEntity"/>
-        
-        <!-- PropVal -->
-        
-        <typeAlias alias="PropertyClass" type="org.alfresco.repo.domain.propval.PropertyClassEntity"/>
-        <typeAlias alias="PropertyDateValue" type="org.alfresco.repo.domain.propval.PropertyDateValueEntity"/>
-        <typeAlias alias="PropertyStringValue" type="org.alfresco.repo.domain.propval.PropertyStringValueEntity"/>
-        <typeAlias alias="PropertyStringQuery" type="org.alfresco.repo.domain.propval.PropertyStringQueryEntity"/>
-        <typeAlias alias="PropertyDoubleValue" type="org.alfresco.repo.domain.propval.PropertyDoubleValueEntity"/>
-        <typeAlias alias="PropertySerializableValue" type="org.alfresco.repo.domain.propval.PropertySerializableValueEntity"/>
-        <typeAlias alias="PropertyValue" type="org.alfresco.repo.domain.propval.PropertyValueEntity"/>
-        <typeAlias alias="PropertyRoot" type="org.alfresco.repo.domain.propval.PropertyRootEntity"/>
-        <typeAlias alias="PropertyLink" type="org.alfresco.repo.domain.propval.PropertyLinkEntity"/>
-        <typeAlias alias="PropertyUniqueContext" type="org.alfresco.repo.domain.propval.PropertyUniqueContextEntity"/>
-        <typeAlias alias="PropertyIdSearchRow" type="org.alfresco.repo.domain.propval.PropertyIdSearchRow"/>
-        <typeAlias alias="PropertyIdQueryResult" type="org.alfresco.repo.domain.propval.PropertyIdQueryResult"/>
-        <typeAlias alias="PropertyIdQueryParameter" type="org.alfresco.repo.domain.propval.PropertyIdQueryParameter"/>
-        
-        <!-- QName -->
-        
-        <typeAlias alias="Namespace" type="org.alfresco.repo.domain.qname.NamespaceEntity"/>
-        <typeAlias alias="QName" type="org.alfresco.repo.domain.qname.QNameEntity"/>
-        
-        <!-- SOLR -->
-        
-        <typeAlias alias="SOLRTransaction" type="org.alfresco.repo.domain.solr.TransactionEntity"/>
-        <typeAlias alias="Node" type="org.alfresco.repo.domain.node.NodeEntity"/>
-        <typeAlias alias="SOLRTransactionParameters" type="org.alfresco.repo.domain.solr.SOLRTransactionParameters"/>
-        <typeAlias alias="NodeParameters" type="org.alfresco.repo.domain.solr.NodeParameters"/>
-        
-        <!-- Usage -->
-        
-        <typeAlias alias="UsageDelta" type="org.alfresco.repo.domain.usage.UsageDeltaEntity"/>
-        
-        <!-- AVM -->
-        
-        <typeAlias alias="AVMStore" type="org.alfresco.repo.domain.avm.AVMStoreEntity"/>
-        <typeAlias alias="AVMNode" type="org.alfresco.repo.domain.avm.AVMNodeEntity"/>
-        <typeAlias alias="AVMNodeAspect" type="org.alfresco.repo.domain.avm.AVMAspectEntity"/>
-        <typeAlias alias="AVMChildEntry" type="org.alfresco.repo.domain.avm.AVMChildEntryEntity"/>
-        <typeAlias alias="AVMVersionRoot" type="org.alfresco.repo.domain.avm.AVMVersionRootEntity"/>
-        <typeAlias alias="AVMHistoryLink" type="org.alfresco.repo.domain.avm.AVMHistoryLinkEntity"/>
-        <typeAlias alias="AVMMergeLink" type="org.alfresco.repo.domain.avm.AVMMergeLinkEntity"/>
-        <typeAlias alias="AVMVersionLayeredNodeEntry" type="org.alfresco.repo.domain.avm.AVMVersionLayeredNodeEntryEntity"/>
-        <typeAlias alias="AVMStoreProperty" type="org.alfresco.repo.domain.avm.AVMStorePropertyEntity"/>
-        <typeAlias alias="AVMNodeProperty" type="org.alfresco.repo.domain.avm.AVMNodePropertyEntity"/>
-        <typeAlias alias="IdListOfIdsParam" type="org.alfresco.repo.domain.patch.ibatis.IdListOfIdsParam"/>
-        
-        <!-- Canned Queries -->
-
-        <typeAlias alias="TestOne" type="org.alfresco.repo.domain.query.CannedQueryDAOTest$TestOneParams"/>
-        <typeAlias alias="Ids" type="org.alfresco.ibatis.IdsEntity"/>
-    
-    </typeAliases>
-    
-    <typeHandlers> 
-        <typeHandler javaType="java.io.Serializable" jdbcType="BLOB" handler="org.alfresco.ibatis.SerializableTypeHandler"/>
-    </typeHandlers>
-    
-    <mappers>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/appliedpatch-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/audit-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/audit-insert-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/qname-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/qname-insert-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/locale-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/locale-insert-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/locks-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/locks-insert-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/content-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/content-insert-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/node-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/node-update-acl-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/node-insert-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/patch-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/permissions-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/permissions-insert-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/propval-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/propval-insert-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/solr-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/usage-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/usage-insert-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/avm-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/avm-insert-SqlMap.xml"/>
-        <!-- Canned queries -->
-        <mapper resource="alfresco/ibatis/#resource.dialect#/query-test-common-SqlMap.xml"/>
-        <mapper resource="alfresco/ibatis/#resource.dialect#/query-usages-common-SqlMap.xml"/>
-    </mappers>
-    
-</configuration>
diff --git a/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java b/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java
index e7f8b46ed4..4a2acdc27e 100644
--- a/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java
@@ -36,11 +36,11 @@ public class ActivityPostDAOImpl extends ActivitiesDAOImpl implements ActivityPo
             (activityPost.getMaxId() != -1) &&
             (activityPost.getStatus() != null))
         {
-            return (List<ActivityPostEntity>)template.selectList("alfresco.activities.select_activity_posts", activityPost);
+            return (List<ActivityPostEntity>)template.selectList("alfresco.activities.select_activity_posts_by_params", activityPost);
         }
         else if (activityPost.getStatus() != null)
         {
-            return (List<ActivityPostEntity>)template.selectList("alfresco.activities.select_activity_posts_by_status_only", activityPost);
+            return (List<ActivityPostEntity>)template.selectList("alfresco.activities.select_activity_posts_by_status", activityPost);
         }
         else
         {