diff --git a/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java b/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java
index 8736d04f69..7ee434b9e5 100644
--- a/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java
+++ b/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java
@@ -47,13 +47,18 @@ public class DateParameterProcessor extends ParameterProcessor implements Parame
 
     private static final String[] ALL_FIELDS_FOR_SUBSTITUTION_QUERY = {
         DAY + SEP + SHORT,
+        DAY,
         DAY + SEP + LONG,
         DAY + SEP + NUMBER,
+        DAY + SEP + YEAR,
         MONTH + SEP + SHORT,
+        MONTH,
         MONTH + SEP + LONG,
         MONTH + SEP + NUMBER,
         YEAR + SEP + SHORT,
-        YEAR + SEP + LONG
+        YEAR,
+        YEAR + SEP + LONG,
+        YEAR + SEP + WEEK
     };
 
     /**
@@ -163,7 +168,7 @@ public class DateParameterProcessor extends ParameterProcessor implements Parame
         }
         else if (WEEK.equalsIgnoreCase(style))
         {
-            pattern = "w";
+            pattern = "ww";
         }
         else
         {
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java
index 31caa4d5c4..55d0d57c81 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java
@@ -70,7 +70,7 @@ public class TestActionPropertySubs extends RMActionExecuterAbstractBase
         String monthNumber = new SimpleDateFormat("MM").format(date);
         String yearShort = new SimpleDateFormat("yy").format(date);
         String yearLong = new SimpleDateFormat("yyyy").format(date);
-        String yearWeek = new SimpleDateFormat("w").format(date);
+        String yearWeek = new SimpleDateFormat("ww").format(date);
         String name = (String) nodeService.getProperty(actionedUponNodeRef, ContentModel.PROP_NAME);
         String company = I18NUtil.getMessage("test.company");
 
diff --git a/rm-server/test/java/org/alfresco/repo/action/parameter/DateParameterProcessorTest.java b/rm-server/test/java/org/alfresco/repo/action/parameter/DateParameterProcessorTest.java
index 1379093aeb..af9626bc65 100644
--- a/rm-server/test/java/org/alfresco/repo/action/parameter/DateParameterProcessorTest.java
+++ b/rm-server/test/java/org/alfresco/repo/action/parameter/DateParameterProcessorTest.java
@@ -47,14 +47,19 @@ public class DateParameterProcessorTest
     {
         List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("date");
         assertTrue(suggestions.contains("date.day.short"));
+        assertTrue(suggestions.contains("date.day"));
         assertTrue(suggestions.contains("date.day.long"));
         assertTrue(suggestions.contains("date.day.number"));
+        assertTrue(suggestions.contains("date.day.year"));
         assertTrue(suggestions.contains("date.month.short"));
+        assertTrue(suggestions.contains("date.month"));
         assertTrue(suggestions.contains("date.month.long"));
         assertTrue(suggestions.contains("date.month.number"));
         assertTrue(suggestions.contains("date.year.short"));
+        assertTrue(suggestions.contains("date.year"));
         assertTrue(suggestions.contains("date.year.long"));
-        assertEquals(8, suggestions.size());
+        assertTrue(suggestions.contains("date.year.week"));
+        assertEquals(13, suggestions.size());
     }
 
     @Test
@@ -62,14 +67,19 @@ public class DateParameterProcessorTest
     {
         List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("dat");
         assertTrue(suggestions.contains("date.day.short"));
+        assertTrue(suggestions.contains("date.day"));
         assertTrue(suggestions.contains("date.day.long"));
         assertTrue(suggestions.contains("date.day.number"));
+        assertTrue(suggestions.contains("date.day.year"));
         assertTrue(suggestions.contains("date.month.short"));
+        assertTrue(suggestions.contains("date.month"));
         assertTrue(suggestions.contains("date.month.long"));
         assertTrue(suggestions.contains("date.month.number"));
         assertTrue(suggestions.contains("date.year.short"));
+        assertTrue(suggestions.contains("date.year"));
         assertTrue(suggestions.contains("date.year.long"));
-        assertEquals(8, suggestions.size());
+        assertTrue(suggestions.contains("date.year.week"));
+        assertEquals(13, suggestions.size());
     }
 
     @Test
@@ -77,14 +87,19 @@ public class DateParameterProcessorTest
     {
         List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("at");
         assertTrue(suggestions.contains("date.day.short"));
+        assertTrue(suggestions.contains("date.day"));
         assertTrue(suggestions.contains("date.day.long"));
         assertTrue(suggestions.contains("date.day.number"));
+        assertTrue(suggestions.contains("date.day.year"));
         assertTrue(suggestions.contains("date.month.short"));
+        assertTrue(suggestions.contains("date.month"));
         assertTrue(suggestions.contains("date.month.long"));
         assertTrue(suggestions.contains("date.month.number"));
         assertTrue(suggestions.contains("date.year.short"));
+        assertTrue(suggestions.contains("date.year"));
         assertTrue(suggestions.contains("date.year.long"));
-        assertEquals(8, suggestions.size());
+        assertTrue(suggestions.contains("date.year.week"));
+        assertEquals(13, suggestions.size());
     }
 
     @Test
@@ -92,9 +107,11 @@ public class DateParameterProcessorTest
     {
         List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("ay");
         assertTrue(suggestions.contains("date.day.short"));
+        assertTrue(suggestions.contains("date.day"));
         assertTrue(suggestions.contains("date.day.long"));
         assertTrue(suggestions.contains("date.day.number"));
-        assertEquals(3, suggestions.size());
+        assertTrue(suggestions.contains("date.day.year"));
+        assertEquals(5, suggestions.size());
     }
 
     @Test
@@ -103,10 +120,11 @@ public class DateParameterProcessorTest
         List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("on");
         assertTrue(suggestions.contains("date.day.long"));
         assertTrue(suggestions.contains("date.month.short"));
+        assertTrue(suggestions.contains("date.month"));
         assertTrue(suggestions.contains("date.month.long"));
         assertTrue(suggestions.contains("date.month.number"));
         assertTrue(suggestions.contains("date.year.long"));
-        assertEquals(5, suggestions.size());
+        assertEquals(6, suggestions.size());
     }
 
 }
diff --git a/rm-server/test/java/org/alfresco/repo/web/scripts/SubstitutionSuggestionsRestApiTest.java b/rm-server/test/java/org/alfresco/repo/web/scripts/SubstitutionSuggestionsRestApiTest.java
index d24887ef34..77a91fbd78 100644
--- a/rm-server/test/java/org/alfresco/repo/web/scripts/SubstitutionSuggestionsRestApiTest.java
+++ b/rm-server/test/java/org/alfresco/repo/web/scripts/SubstitutionSuggestionsRestApiTest.java
@@ -86,7 +86,8 @@ public class SubstitutionSuggestionsRestApiTest extends BaseRMWebScriptTestCase
         {
             "date.month.number",
             "date.month.long",
-            "date.month.short"
+            "date.month.short",
+            "date.month"
         });
     }
 }
\ No newline at end of file