diff --git a/repository/src/main/resources/alfresco/model/contentModel.xml b/repository/src/main/resources/alfresco/model/contentModel.xml
index 459e3773b4..2a1a077a41 100644
--- a/repository/src/main/resources/alfresco/model/contentModel.xml
+++ b/repository/src/main/resources/alfresco/model/contentModel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- xsi:schemaLocation="http://www.alfresco.org/model/dictionary/1.0 modelSchema.xsd" -->
-<model name="cm:contentmodel" 
-       xmlns="http://www.alfresco.org/model/dictionary/1.0" 
+<model name="cm:contentmodel"
+       xmlns="http://www.alfresco.org/model/dictionary/1.0"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
    <description>Alfresco Content Domain Model</description>
@@ -91,7 +91,7 @@
                <mandatory>false</mandatory>
                <!-- Although content is marked as indexed atomically it may end up asynchronous -->
                <!-- if the content conversion will take too long. Content that does not require conversion -->
-               <!-- to UTF8 test/plain will always be indexed atomically -->
+               <!-- to UTF8 text/plain will always be indexed atomically -->
                <index enabled="true">
                   <atomic>true</atomic>
                   <stored>false</stored>
@@ -609,7 +609,7 @@
                <index enabled="true">
                   <atomic>true</atomic>
                   <stored>false</stored> 
-                  <tokenised>true</tokenised>
+                  <tokenised>false</tokenised>
                   <facetable>true</facetable>
                </index>
             </property>
@@ -633,7 +633,7 @@
                <index enabled="true">
                   <atomic>true</atomic>
                   <stored>false</stored> 
-                  <tokenised>true</tokenised>
+                  <tokenised>false</tokenised>
                   <facetable>true</facetable>
                </index>
             </property>
diff --git a/repository/src/test/resources/alfresco/extension/model/testContentModel.xml b/repository/src/test/resources/alfresco/extension/model/testContentModel.xml
index 0b71dd35f7..04130511f6 100644
--- a/repository/src/test/resources/alfresco/extension/model/testContentModel.xml
+++ b/repository/src/test/resources/alfresco/extension/model/testContentModel.xml
@@ -583,6 +583,9 @@
                <type>d:text</type>
                <protected>true</protected>
                <mandatory enforced="true">true</mandatory>
+               <index enabled="true">
+                  <tokenised>false</tokenised>
+               </index>
             </property>
             <property name="cm:modified">
                <title>Modified</title>
@@ -600,6 +603,9 @@
                <type>d:text</type>
                <protected>true</protected>
                <mandatory enforced="true">true</mandatory>
+               <index enabled="true">
+                  <tokenised>false</tokenised>
+               </index>
             </property>
             <property name="cm:accessed">
                <title>Accessed</title>