diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql
index f0ac38d00a..ed46264cce 100644
--- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql
+++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql
@@ -26,7 +26,7 @@ ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year;
 
     create table avm_aspects_new (
         id number(19,0) not null,
-        qname_id number(19,0) not null,
+        name varchar2(200 char) not null,
         primary key (id, qname_id)
     );                                                -- (optional)
 
@@ -57,14 +57,14 @@ ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year;
         double_value double precision,
         string_value varchar2(1024 char),
         serializable_value long raw,
-        qname_id number(19,0) not null,
+        qname varchar2(200 char) not null,
         primary key (node_id, qname_id)
     );                                                -- (optional)
 
     create table avm_store_properties (
         id number(19,0) not null,
         avm_store_id number(19,0),
-        qname_id number(19,0) not null,
+        qname varchar2(200 char) not null,
         actual_type_n number(10,0) not null,
         persisted_type_n number(10,0) not null,
         multi_valued number(1,0) not null,
diff --git a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
index 9fa2a14a65..c23ce075bc 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
+++ b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
@@ -656,9 +656,10 @@
          node
       from
          org.alfresco.repo.domain.hibernate.NodeImpl as node
+	     join node.properties as props
       where
-         node.properties.serializableValue is not null and
-         node.properties.multiValued = false
+         props.serializableValue is not null and
+         props.multiValued = false
    </query>
 
    <query name="node.patch.GetAssocsAndChildNames">