Index: api/src/main/java/org/sakaiproject/messagebundle/api/MessageBundleProperty.hbm.xml
===================================================================
--- api/src/main/java/org/sakaiproject/messagebundle/api/MessageBundleProperty.hbm.xml	(revision 310374)
+++ api/src/main/java/org/sakaiproject/messagebundle/api/MessageBundleProperty.hbm.xml	(working copy)
@@ -4,7 +4,7 @@
 
 <hibernate-mapping default-cascade="none" package="org.sakaiproject.messagebundle.api" default-lazy="false">
 
-	<class name="MessageBundleProperty" table="SAKAI_MESSAGE_BUNDLE">
+	<class name="MessageBundleProperty" table="SAKAI_MESSAGE_BUNDLE" >
         <cache usage="nonstrict-read-write" />
 
         <id name="id" column="ID" type="long">
@@ -12,13 +12,23 @@
                 <param name="sequence">SAKAI_MESSAGEBUNDLE_S</param>
             </generator>
         </id>
+        <!-- We need 2 indexes on columns so that's why we use the <column> tag.
+             Column order matters because it affects  multi-column index order. -->
+        <property name="baseName" type="string" not-null="true" length="255" index="SMB_BASENAME_IDX">
+            <column name="BASENAME" index="SMB_SEARCH"/>
+        </property>
+        <property name="moduleName" type="string" not-null="true" length="255" index="SMB_MODULE_IDX">
+            <column name="MODULE_NAME" index="SMB_SEARCH"/>
+        </property>
+        <property name="locale" type="string" not-null="true" length="255" index="SMB_LOCALE_IDX">
+            <column name="LOCALE" index="SMB_SEARCH"/>
+        </property>
+        <property name="propertyName" type="string" not-null="true" length="255" index="SMB_PROPNAME_IDX">
+            <column name="PROP_NAME" index="SMB_SEARCH"/>
+        </property>
 
-        <property name="moduleName" column="MODULE_NAME" type="string" not-null="true" length="255" index="SMB_MODULE_IDX"/>
-        <property name="baseName" column="BASENAME" type="string" not-null="true" length="255" index="SMB_BASENAME_IDX"/>
-        <property name="propertyName" column="PROP_NAME" type="string" not-null="true" length="255" index="SMB_PROPNAME_IDX"/>
+        <property name="defaultValue" column="DEFAULT_VALUE" type="string" length="4000" not-null="false" />
         <property name="value" column="PROP_VALUE" type="string" not-null="false" length="4000" />
-        <property name="locale" column="LOCALE" type="string" not-null="true" length="255" index="SMB_LOCALE_IDX"/>
-        <property name="defaultValue" column="DEFAULT_VALUE" type="string" length="4000" not-null="false" />
 
     </class>
 </hibernate-mapping>