diff --git a/server/AyaNova/biz/FilterSpecialTokens.cs b/server/AyaNova/biz/FilterSpecialTokens.cs
index 37a89024..376eefbc 100644
--- a/server/AyaNova/biz/FilterSpecialTokens.cs
+++ b/server/AyaNova/biz/FilterSpecialTokens.cs
@@ -22,7 +22,7 @@ namespace AyaNova.Biz
         public const string ThisYear = "{[thisyear]}";
         public const string InTheLast3Months = "{[last3months]}";
         public const string InTheLast6Months = "{[last6months]}";
-        public const string InTheLastYear = "{[lastyear]}";
+        public const string InTheLastYear = "{[lastcalendaryear]}";
         public const string AH = "{[ah]}";
         public const string IP = "{[ip]}";
         public const string QZ = "{[qz]}";
diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
index 099181fe..036dce86 100644
--- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
+++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
@@ -568,7 +568,7 @@ namespace AyaNova.Biz
                                         sb.Append("'");
                                         break;
 
-                                    case "[LASTYEAR]":
+                                    case FilterSpecialToken.LastYear:
                                         //From zero hour january 1 a year ago
                                         dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 1, 1, 00, 00, 00);
                                         //To zero hour January 1 this year
@@ -583,7 +583,7 @@ namespace AyaNova.Biz
                                         sb.Append("'");
                                         break;
 
-                                    case "[THISYEAR]":
+                                    case FilterSpecialToken.ThisYear:
                                         //From zero hour january 1 this year
                                         dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
                                         //To zero hour Jan 1 next year
@@ -598,7 +598,7 @@ namespace AyaNova.Biz
                                         sb.Append("'");
                                         break;
 
-                                    case "[INTHELAST3MONTHS]":
+                                    case FilterSpecialToken.InTheLast3Months:
                                         //From Now minus 3 months
                                         dtAfter = DateTime.Now.AddMonths(-3);
                                         //To Now
@@ -613,7 +613,7 @@ namespace AyaNova.Biz
                                         sb.Append("'");
                                         break;
 
-                                    case "[INTHELAST6MONTHS]":
+                                    case FilterSpecialToken.InTheLast6Months:
                                         //From Now minus 6 months
                                         dtAfter = DateTime.Now.AddMonths(-6);
                                         //To Now
@@ -628,7 +628,7 @@ namespace AyaNova.Biz
                                         sb.Append("'");
                                         break;
 
-                                    case "[INTHELASTYEAR]":
+                                    case FilterSpecialToken.InTheLastYear:
                                         //From Now minus 365 days
                                         dtAfter = DateTime.Now.AddDays(-365);
                                         //To Now