From a707be9eae0fdd98b66ed1b658be92c51151f065 Mon Sep 17 00:00:00 2001
From: Enzo Lebrun <enzo.the@gmail.com>
Date: Mon, 14 Jan 2019 09:25:38 -0800
Subject: [PATCH] Value before month in zh can be an integers or a chinese char
 (#301)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
May 2019 is more often written like' 2019年5月' than ' 2019年五月' so the corresponding integer are added in the regex's rule ruleMonths.
Pull Request resolved: https://github.com/facebook/duckling/pull/301

Reviewed By: haoxuany

Differential Revision: D13606127

Pulled By: patapizza

fbshipit-source-id: 7dd2536e36711b4be42a93419b08dbd66cf31523
---
 Duckling/Ranking/Classifiers/ZH_CN.hs | 226 ++++++++++++--------------
 Duckling/Ranking/Classifiers/ZH_HK.hs | 226 ++++++++++++--------------
 Duckling/Ranking/Classifiers/ZH_MO.hs | 226 ++++++++++++--------------
 Duckling/Ranking/Classifiers/ZH_TW.hs | 226 ++++++++++++--------------
 Duckling/Ranking/Classifiers/ZH_XX.hs | 224 ++++++++++++-------------
 Duckling/Time/ZH/Corpus.hs            |  13 +-
 Duckling/Time/ZH/Rules.hs             |  21 +--
 7 files changed, 514 insertions(+), 648 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/ZH_CN.hs b/Duckling/Ranking/Classifiers/ZH_CN.hs
index 8ba4e8947..8ef1e9aa7 100644
--- a/Duckling/Ranking/Classifiers/ZH_CN.hs
+++ b/Duckling/Ranking/Classifiers/ZH_CN.hs
@@ -41,10 +41,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5020919437972361, unseen = -3.871201010907891,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 46},
+                     ClassData{prior = -0.48550781578170077,
+                               unseen = -3.912023005428146,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 48},
                    koData =
-                     ClassData{prior = -0.9295359586241757,
+                     ClassData{prior = -0.9555114450274363,
                                unseen = -3.4657359027997265,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 30}}),
        ("the day before yesterday",
@@ -100,22 +101,15 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("October",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = -1.0076405104623831,
+                     ClassData{prior = -1.0541605260972757,
                                unseen = -3.2188758248682006,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 23},
                    koData =
-                     ClassData{prior = -0.45425527227759643,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40}}),
+                     ClassData{prior = -0.42845462633286313,
+                               unseen = -3.8066624897703196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 43}}),
        ("<time-of-day> o'clock",
         Classifier{okData =
                      ClassData{prior = -0.4418327522790392, unseen = -3.044522437723423,
@@ -169,45 +163,45 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.3519764231571781, unseen = -4.983606621708336,
+                     ClassData{prior = -0.6061358035703156, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("\20799\31461\33410<part-of-day> <dim time>",
-                                     -3.367295829986474),
+                                     -2.995732273553991),
                                     ("year (numeric with year symbol)<named-month> <day-of-month>",
-                                     -1.7578579175523736),
-                                    ("dayday", -1.6094379124341003),
-                                    ("hourhour", -3.367295829986474),
-                                    ("hourminute", -3.367295829986474),
+                                     -1.7719568419318752),
+                                    ("dayday", -1.8971199848858813),
+                                    ("hourhour", -2.995732273553991),
+                                    ("hourminute", -2.995732273553991),
                                     ("absorption of , after named day<named-month> <day-of-month>",
-                                     -1.6094379124341003),
-                                    ("dayminute", -3.367295829986474),
-                                    ("tonight<time-of-day> o'clock", -3.367295829986474),
+                                     -1.8971199848858813),
+                                    ("dayminute", -2.995732273553991),
+                                    ("tonight<time-of-day> o'clock", -2.995732273553991),
                                     ("<dim time> <part-of-day>relative minutes after|past <integer> (hour-of-day)",
-                                     -3.367295829986474),
-                                    ("yearday", -1.7578579175523736)],
-                               n = 64},
+                                     -2.995732273553991),
+                                    ("yearday", -1.7719568419318752)],
+                               n = 42},
                    koData =
-                     ClassData{prior = -1.215022640512521, unseen = -4.276666119016055,
+                     ClassData{prior = -0.7884573603642702, unseen = -4.465908118654584,
                                likelihoods =
                                  HashMap.fromList
                                    [("\20799\31461\33410<part-of-day> <dim time>",
-                                     -2.065455299705096),
-                                    ("dayhour", -2.653241964607215),
-                                    ("daymonth", -2.1832383353614793),
-                                    ("year (numeric with year symbol)February", -3.164067588373206),
+                                     -2.257122718917288),
+                                    ("dayhour", -2.8449093838194073),
+                                    ("daymonth", -2.374905754573672),
                                     ("<dim time> <part-of-day><time-of-day> o'clock",
-                                     -3.164067588373206),
-                                    ("hourhour", -3.164067588373206),
-                                    ("year (numeric with year symbol)March", -2.653241964607215),
-                                    ("hourminute", -2.653241964607215),
-                                    ("yearmonth", -2.316769727986002),
-                                    ("dayminute", -2.653241964607215),
+                                     -3.355735007585398),
+                                    ("year (numeric with year symbol)month (numeric with month symbol)",
+                                     -1.7462970951512977),
+                                    ("hourhour", -3.355735007585398),
+                                    ("hourminute", -2.8449093838194073),
+                                    ("absorption of , after named daymonth (numeric with month symbol)",
+                                     -2.374905754573672),
+                                    ("yearmonth", -1.7462970951512977),
+                                    ("dayminute", -2.8449093838194073),
                                     ("<dim time> <part-of-day>relative minutes after|past <integer> (hour-of-day)",
-                                     -2.653241964607215),
-                                    ("absorption of , after named dayFebruary",
-                                     -2.1832383353614793)],
-                               n = 27}}),
+                                     -2.8449093838194073)],
+                               n = 35}}),
        ("year (grain)",
         Classifier{okData =
                      ClassData{prior = -0.8209805520698302,
@@ -329,33 +323,33 @@ classifiers
                                n = 50}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.332204510175204,
+                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Octoberordinal (digits)Monday", -1.6863989535702288),
-                                    ("monthday", -0.7308875085427924),
+                                   [("monthday", -0.6931471805599453),
                                     ("month (numeric with month symbol)ordinal (digits)Monday",
-                                     -1.0986122886681098)],
-                               n = 12},
+                                     -0.6931471805599453)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (numeric with month symbol)",
         Classifier{okData =
-                     ClassData{prior = -0.10763066419236544,
-                               unseen = -3.891820298110627,
+                     ClassData{prior = -0.3087354816496133, unseen = -3.951243718581427,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.1631508098056809),
-                                    ("number suffix: \21313", -2.2617630984737906),
-                                    ("integer (0..10)", -0.5753641449035618)],
-                               n = 44},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("number suffix: \21313", -2.322387720290225),
+                                    ("integer (0..10)", -0.5996211225491218)],
+                               n = 47},
                    koData =
-                     ClassData{prior = -2.2823823856765264,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -1.3256697393034558,
+                               unseen = -3.0910424533583156,
                                likelihoods =
-                                 HashMap.fromList [("<number>\20010/\20491", -0.40546510810816444)],
-                               n = 5}}),
+                                 HashMap.fromList
+                                   [("integer (0..10)", -1.9459101490553135),
+                                    ("<number>\20010/\20491", -0.2719337154836418)],
+                               n = 17}}),
        ("week (grain)",
         Classifier{okData =
                      ClassData{prior = -0.8434293836092833,
@@ -469,13 +463,6 @@ classifiers
                                     ("hour", -2.2617630984737906), ("month", -2.772588722239781),
                                     ("minute", -2.772588722239781)],
                                n = 20}}),
-       ("February",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this <cycle>",
         Classifier{okData =
                      ClassData{prior = -1.0185695809945732,
@@ -504,16 +491,16 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<dim time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -4.31748811353631,
+                     ClassData{prior = 0.0, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -0.7487170317147561),
-                                    ("national dayevening|night", -3.20545280453606),
-                                    ("<named-month> <day-of-month>morning", -1.2595426554807467),
-                                    ("\24773\20154\33410evening|night", -3.20545280453606),
-                                    ("\20799\31461\33410afternoon", -3.20545280453606),
-                                    ("Mondaymorning", -2.10684051586795)],
-                               n = 34},
+                                   [("dayhour", -0.7646061445420903),
+                                    ("national dayevening|night", -2.9618307218783095),
+                                    ("<named-month> <day-of-month>morning", -1.4954936530848826),
+                                    ("\24773\20154\33410evening|night", -2.9618307218783095),
+                                    ("\20799\31461\33410afternoon", -2.9618307218783095),
+                                    ("Mondaymorning", -1.8632184332102)],
+                               n = 26},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -551,29 +538,29 @@ classifiers
                      ClassData{prior = -infinity, unseen = -3.044522437723423,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -5.905361848054571,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("week", -2.6837575085331653),
-                                    ("integer (0..10)month (grain)", -2.535337503414892),
-                                    ("integer (0..10)hour (grain)", -3.06941998934515),
-                                    ("<number>\20010/\20491week (grain)", -3.5047380606029956),
-                                    ("second", -3.2635760037861075),
-                                    ("integer (0..10)day (grain)", -3.06941998934515),
-                                    ("number suffix: \21313month (grain)", -4.293195420967266),
-                                    ("integer (0..10)year (grain)", -3.6000482404073204),
-                                    ("<number>\20010/\20491month (grain)", -3.130044611161585),
-                                    ("integer (numeric)year (grain)", -3.1945831322991562),
-                                    ("integer (0..10)second (grain)", -3.2635760037861075),
-                                    ("day", -3.06941998934515), ("year", -2.7245795030534206),
-                                    ("integer (0..10)minute (grain)", -3.06941998934515),
-                                    ("hour", -2.8581108956779433),
-                                    ("integer (0..10)week (grain)", -3.1945831322991562),
-                                    ("month", -1.7754989483562746),
-                                    ("<number>\20010/\20491hour (grain)", -4.293195420967266),
-                                    ("integer (numeric)month (grain)", -3.1945831322991562),
-                                    ("minute", -3.06941998934515)],
-                               n = 173}}),
+                     ClassData{prior = 0.0, unseen = -5.921578419643816,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -2.700018029404946),
+                                    ("integer (0..10)month (grain)", -2.517696472610991),
+                                    ("integer (0..10)hour (grain)", -3.0856805102169305),
+                                    ("<number>\20010/\20491week (grain)", -3.520998581474776),
+                                    ("second", -3.2798365246578878),
+                                    ("integer (0..10)day (grain)", -3.0856805102169305),
+                                    ("number suffix: \21313month (grain)", -4.309455941839047),
+                                    ("integer (0..10)year (grain)", -3.6163087612791007),
+                                    ("<number>\20010/\20491month (grain)", -3.146305132033365),
+                                    ("integer (numeric)year (grain)", -3.2108436531709366),
+                                    ("integer (0..10)second (grain)", -3.2798365246578878),
+                                    ("day", -3.0856805102169305), ("year", -2.740840023925201),
+                                    ("integer (0..10)minute (grain)", -3.0856805102169305),
+                                    ("hour", -2.8743714165497236),
+                                    ("integer (0..10)week (grain)", -3.2108436531709366),
+                                    ("month", -1.7445065843775094),
+                                    ("<number>\20010/\20491hour (grain)", -4.309455941839047),
+                                    ("integer (numeric)month (grain)", -3.0856805102169305),
+                                    ("minute", -3.0856805102169305)],
+                               n = 176}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.70805020110221,
@@ -621,19 +608,21 @@ classifiers
                                n = 10}}),
        ("intersect by \",\"",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -4.110873864173311,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Sunday<named-month> <day-of-month>", -0.7270487322356266),
-                                    ("dayday", -0.7270487322356266)],
-                               n = 28},
+                                   [("Sunday<named-month> <day-of-month>", -0.7576857016975165),
+                                    ("dayday", -0.7576857016975165)],
+                               n = 14},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
+                     ClassData{prior = -1.0986122886681098,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
                                    [("daymonth", -0.8109302162163288),
-                                    ("SundayFebruary", -0.8109302162163288)],
+                                    ("Sundaymonth (numeric with month symbol)",
+                                     -0.8109302162163288)],
                                n = 7}}),
        ("integer with consecutive unit modifiers",
         Classifier{okData =
@@ -691,13 +680,6 @@ classifiers
                                     ("month (numeric with month symbol)", -2.5649493574615367),
                                     ("hour", -0.916290731874155), ("month", -2.5649493574615367)],
                                n = 29}}),
-       ("March",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("the day after tomorrow",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -797,27 +779,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -5.231108616854587,
+                     ClassData{prior = 0.0, unseen = -4.68213122712422,
                                likelihoods =
                                  HashMap.fromList
                                    [("month (numeric with month symbol)integer with consecutive unit modifiers",
-                                     -2.392533329656985),
-                                    ("Marchinteger (0..10)", -3.4339872044851463),
-                                    ("Marchinteger (numeric)", -4.127134385045092),
+                                     -1.83961549040569),
                                     ("month (numeric with month symbol)integer (numeric)",
-                                     -2.517696472610991),
-                                    ("Februaryinteger (0..10)", -3.146305132033365),
+                                     -1.9647786333596962),
                                     ("month (numeric with month symbol)number suffix: \21313",
-                                     -3.146305132033365),
-                                    ("month", -0.7371103039810614),
+                                     -2.5933872927820705),
+                                    ("month", -0.7215851158804788),
                                     ("month (numeric with month symbol)integer (0..10)",
-                                     -2.517696472610991),
-                                    ("Februaryinteger with consecutive unit modifiers",
-                                     -2.392533329656985),
-                                    ("Februarynumber suffix: \21313", -3.146305132033365)],
-                               n = 88},
+                                     -1.9647786333596962)],
+                               n = 51},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.3978952727983707,
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\21171\21160\33410",
         Classifier{okData =
@@ -828,10 +804,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (0..10)",
         Classifier{okData =
-                     ClassData{prior = -0.4090429294560484, unseen = -5.236441962829949,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 186},
+                     ClassData{prior = -0.4072460524791592, unseen = -5.241747015059643,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 187},
                    koData =
-                     ClassData{prior = -1.0914948208992459, unseen = -4.564348191467836,
+                     ClassData{prior = -1.095059887063742, unseen = -4.564348191467836,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 94}}),
        ("last n <cycle>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/ZH_HK.hs b/Duckling/Ranking/Classifiers/ZH_HK.hs
index bc7493200..b9cf8c2bb 100644
--- a/Duckling/Ranking/Classifiers/ZH_HK.hs
+++ b/Duckling/Ranking/Classifiers/ZH_HK.hs
@@ -41,10 +41,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5020919437972361, unseen = -3.871201010907891,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 46},
+                     ClassData{prior = -0.48550781578170077,
+                               unseen = -3.912023005428146,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 48},
                    koData =
-                     ClassData{prior = -0.9295359586241757,
+                     ClassData{prior = -0.9555114450274363,
                                unseen = -3.4657359027997265,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 30}}),
        ("the day before yesterday",
@@ -100,22 +101,15 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("October",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = -1.0076405104623831,
+                     ClassData{prior = -1.0541605260972757,
                                unseen = -3.2188758248682006,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 23},
                    koData =
-                     ClassData{prior = -0.45425527227759643,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40}}),
+                     ClassData{prior = -0.42845462633286313,
+                               unseen = -3.8066624897703196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 43}}),
        ("<time-of-day> o'clock",
         Classifier{okData =
                      ClassData{prior = -0.4418327522790392, unseen = -3.044522437723423,
@@ -169,45 +163,45 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.3519764231571781, unseen = -4.983606621708336,
+                     ClassData{prior = -0.6061358035703156, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("\20799\31461\33410<part-of-day> <dim time>",
-                                     -3.367295829986474),
+                                     -2.995732273553991),
                                     ("year (numeric with year symbol)<named-month> <day-of-month>",
-                                     -1.7578579175523736),
-                                    ("dayday", -1.6094379124341003),
-                                    ("hourhour", -3.367295829986474),
-                                    ("hourminute", -3.367295829986474),
+                                     -1.7719568419318752),
+                                    ("dayday", -1.8971199848858813),
+                                    ("hourhour", -2.995732273553991),
+                                    ("hourminute", -2.995732273553991),
                                     ("absorption of , after named day<named-month> <day-of-month>",
-                                     -1.6094379124341003),
-                                    ("dayminute", -3.367295829986474),
-                                    ("tonight<time-of-day> o'clock", -3.367295829986474),
+                                     -1.8971199848858813),
+                                    ("dayminute", -2.995732273553991),
+                                    ("tonight<time-of-day> o'clock", -2.995732273553991),
                                     ("<dim time> <part-of-day>relative minutes after|past <integer> (hour-of-day)",
-                                     -3.367295829986474),
-                                    ("yearday", -1.7578579175523736)],
-                               n = 64},
+                                     -2.995732273553991),
+                                    ("yearday", -1.7719568419318752)],
+                               n = 42},
                    koData =
-                     ClassData{prior = -1.215022640512521, unseen = -4.276666119016055,
+                     ClassData{prior = -0.7884573603642702, unseen = -4.465908118654584,
                                likelihoods =
                                  HashMap.fromList
                                    [("\20799\31461\33410<part-of-day> <dim time>",
-                                     -2.065455299705096),
-                                    ("dayhour", -2.653241964607215),
-                                    ("daymonth", -2.1832383353614793),
-                                    ("year (numeric with year symbol)February", -3.164067588373206),
+                                     -2.257122718917288),
+                                    ("dayhour", -2.8449093838194073),
+                                    ("daymonth", -2.374905754573672),
                                     ("<dim time> <part-of-day><time-of-day> o'clock",
-                                     -3.164067588373206),
-                                    ("hourhour", -3.164067588373206),
-                                    ("year (numeric with year symbol)March", -2.653241964607215),
-                                    ("hourminute", -2.653241964607215),
-                                    ("yearmonth", -2.316769727986002),
-                                    ("dayminute", -2.653241964607215),
+                                     -3.355735007585398),
+                                    ("year (numeric with year symbol)month (numeric with month symbol)",
+                                     -1.7462970951512977),
+                                    ("hourhour", -3.355735007585398),
+                                    ("hourminute", -2.8449093838194073),
+                                    ("absorption of , after named daymonth (numeric with month symbol)",
+                                     -2.374905754573672),
+                                    ("yearmonth", -1.7462970951512977),
+                                    ("dayminute", -2.8449093838194073),
                                     ("<dim time> <part-of-day>relative minutes after|past <integer> (hour-of-day)",
-                                     -2.653241964607215),
-                                    ("absorption of , after named dayFebruary",
-                                     -2.1832383353614793)],
-                               n = 27}}),
+                                     -2.8449093838194073)],
+                               n = 35}}),
        ("year (grain)",
         Classifier{okData =
                      ClassData{prior = -0.8209805520698302,
@@ -329,33 +323,33 @@ classifiers
                                n = 50}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.332204510175204,
+                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Octoberordinal (digits)Monday", -1.6863989535702288),
-                                    ("monthday", -0.7308875085427924),
+                                   [("monthday", -0.6931471805599453),
                                     ("month (numeric with month symbol)ordinal (digits)Monday",
-                                     -1.0986122886681098)],
-                               n = 12},
+                                     -0.6931471805599453)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (numeric with month symbol)",
         Classifier{okData =
-                     ClassData{prior = -0.10763066419236544,
-                               unseen = -3.891820298110627,
+                     ClassData{prior = -0.3087354816496133, unseen = -3.951243718581427,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.1631508098056809),
-                                    ("number suffix: \21313", -2.2617630984737906),
-                                    ("integer (0..10)", -0.5753641449035618)],
-                               n = 44},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("number suffix: \21313", -2.322387720290225),
+                                    ("integer (0..10)", -0.5996211225491218)],
+                               n = 47},
                    koData =
-                     ClassData{prior = -2.2823823856765264,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -1.3256697393034558,
+                               unseen = -3.0910424533583156,
                                likelihoods =
-                                 HashMap.fromList [("<number>\20010/\20491", -0.40546510810816444)],
-                               n = 5}}),
+                                 HashMap.fromList
+                                   [("integer (0..10)", -1.9459101490553135),
+                                    ("<number>\20010/\20491", -0.2719337154836418)],
+                               n = 17}}),
        ("week (grain)",
         Classifier{okData =
                      ClassData{prior = -0.8434293836092833,
@@ -469,13 +463,6 @@ classifiers
                                     ("hour", -2.2617630984737906), ("month", -2.772588722239781),
                                     ("minute", -2.772588722239781)],
                                n = 20}}),
-       ("February",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this <cycle>",
         Classifier{okData =
                      ClassData{prior = -1.0185695809945732,
@@ -504,16 +491,16 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<dim time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -4.31748811353631,
+                     ClassData{prior = 0.0, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -0.7487170317147561),
-                                    ("national dayevening|night", -3.20545280453606),
-                                    ("<named-month> <day-of-month>morning", -1.2595426554807467),
-                                    ("\24773\20154\33410evening|night", -3.20545280453606),
-                                    ("\20799\31461\33410afternoon", -3.20545280453606),
-                                    ("Mondaymorning", -2.10684051586795)],
-                               n = 34},
+                                   [("dayhour", -0.7646061445420903),
+                                    ("national dayevening|night", -2.9618307218783095),
+                                    ("<named-month> <day-of-month>morning", -1.4954936530848826),
+                                    ("\24773\20154\33410evening|night", -2.9618307218783095),
+                                    ("\20799\31461\33410afternoon", -2.9618307218783095),
+                                    ("Mondaymorning", -1.8632184332102)],
+                               n = 26},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -551,29 +538,29 @@ classifiers
                      ClassData{prior = -infinity, unseen = -3.044522437723423,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -5.905361848054571,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("week", -2.6837575085331653),
-                                    ("integer (0..10)month (grain)", -2.535337503414892),
-                                    ("integer (0..10)hour (grain)", -3.06941998934515),
-                                    ("<number>\20010/\20491week (grain)", -3.5047380606029956),
-                                    ("second", -3.2635760037861075),
-                                    ("integer (0..10)day (grain)", -3.06941998934515),
-                                    ("number suffix: \21313month (grain)", -4.293195420967266),
-                                    ("integer (0..10)year (grain)", -3.6000482404073204),
-                                    ("<number>\20010/\20491month (grain)", -3.130044611161585),
-                                    ("integer (numeric)year (grain)", -3.1945831322991562),
-                                    ("integer (0..10)second (grain)", -3.2635760037861075),
-                                    ("day", -3.06941998934515), ("year", -2.7245795030534206),
-                                    ("integer (0..10)minute (grain)", -3.06941998934515),
-                                    ("hour", -2.8581108956779433),
-                                    ("integer (0..10)week (grain)", -3.1945831322991562),
-                                    ("month", -1.7754989483562746),
-                                    ("<number>\20010/\20491hour (grain)", -4.293195420967266),
-                                    ("integer (numeric)month (grain)", -3.1945831322991562),
-                                    ("minute", -3.06941998934515)],
-                               n = 173}}),
+                     ClassData{prior = 0.0, unseen = -5.921578419643816,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -2.700018029404946),
+                                    ("integer (0..10)month (grain)", -2.517696472610991),
+                                    ("integer (0..10)hour (grain)", -3.0856805102169305),
+                                    ("<number>\20010/\20491week (grain)", -3.520998581474776),
+                                    ("second", -3.2798365246578878),
+                                    ("integer (0..10)day (grain)", -3.0856805102169305),
+                                    ("number suffix: \21313month (grain)", -4.309455941839047),
+                                    ("integer (0..10)year (grain)", -3.6163087612791007),
+                                    ("<number>\20010/\20491month (grain)", -3.146305132033365),
+                                    ("integer (numeric)year (grain)", -3.2108436531709366),
+                                    ("integer (0..10)second (grain)", -3.2798365246578878),
+                                    ("day", -3.0856805102169305), ("year", -2.740840023925201),
+                                    ("integer (0..10)minute (grain)", -3.0856805102169305),
+                                    ("hour", -2.8743714165497236),
+                                    ("integer (0..10)week (grain)", -3.2108436531709366),
+                                    ("month", -1.7445065843775094),
+                                    ("<number>\20010/\20491hour (grain)", -4.309455941839047),
+                                    ("integer (numeric)month (grain)", -3.0856805102169305),
+                                    ("minute", -3.0856805102169305)],
+                               n = 176}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.70805020110221,
@@ -621,19 +608,21 @@ classifiers
                                n = 10}}),
        ("intersect by \",\"",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -4.110873864173311,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Sunday<named-month> <day-of-month>", -0.7270487322356266),
-                                    ("dayday", -0.7270487322356266)],
-                               n = 28},
+                                   [("Sunday<named-month> <day-of-month>", -0.7576857016975165),
+                                    ("dayday", -0.7576857016975165)],
+                               n = 14},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
+                     ClassData{prior = -1.0986122886681098,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
                                    [("daymonth", -0.8109302162163288),
-                                    ("SundayFebruary", -0.8109302162163288)],
+                                    ("Sundaymonth (numeric with month symbol)",
+                                     -0.8109302162163288)],
                                n = 7}}),
        ("integer with consecutive unit modifiers",
         Classifier{okData =
@@ -691,13 +680,6 @@ classifiers
                                     ("month (numeric with month symbol)", -2.5649493574615367),
                                     ("hour", -0.916290731874155), ("month", -2.5649493574615367)],
                                n = 29}}),
-       ("March",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("the day after tomorrow",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -797,27 +779,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -5.231108616854587,
+                     ClassData{prior = 0.0, unseen = -4.68213122712422,
                                likelihoods =
                                  HashMap.fromList
                                    [("month (numeric with month symbol)integer with consecutive unit modifiers",
-                                     -2.392533329656985),
-                                    ("Marchinteger (0..10)", -3.4339872044851463),
-                                    ("Marchinteger (numeric)", -4.127134385045092),
+                                     -1.83961549040569),
                                     ("month (numeric with month symbol)integer (numeric)",
-                                     -2.517696472610991),
-                                    ("Februaryinteger (0..10)", -3.146305132033365),
+                                     -1.9647786333596962),
                                     ("month (numeric with month symbol)number suffix: \21313",
-                                     -3.146305132033365),
-                                    ("month", -0.7371103039810614),
+                                     -2.5933872927820705),
+                                    ("month", -0.7215851158804788),
                                     ("month (numeric with month symbol)integer (0..10)",
-                                     -2.517696472610991),
-                                    ("Februaryinteger with consecutive unit modifiers",
-                                     -2.392533329656985),
-                                    ("Februarynumber suffix: \21313", -3.146305132033365)],
-                               n = 88},
+                                     -1.9647786333596962)],
+                               n = 51},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.3978952727983707,
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\21171\21160\33410",
         Classifier{okData =
@@ -828,10 +804,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (0..10)",
         Classifier{okData =
-                     ClassData{prior = -0.4090429294560484, unseen = -5.236441962829949,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 186},
+                     ClassData{prior = -0.4072460524791592, unseen = -5.241747015059643,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 187},
                    koData =
-                     ClassData{prior = -1.0914948208992459, unseen = -4.564348191467836,
+                     ClassData{prior = -1.095059887063742, unseen = -4.564348191467836,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 94}}),
        ("last n <cycle>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/ZH_MO.hs b/Duckling/Ranking/Classifiers/ZH_MO.hs
index 3bcf69518..0c3562435 100644
--- a/Duckling/Ranking/Classifiers/ZH_MO.hs
+++ b/Duckling/Ranking/Classifiers/ZH_MO.hs
@@ -41,10 +41,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5020919437972361, unseen = -3.871201010907891,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 46},
+                     ClassData{prior = -0.48550781578170077,
+                               unseen = -3.912023005428146,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 48},
                    koData =
-                     ClassData{prior = -0.9295359586241757,
+                     ClassData{prior = -0.9555114450274363,
                                unseen = -3.4657359027997265,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 30}}),
        ("the day before yesterday",
@@ -100,22 +101,15 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("October",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = -1.0076405104623831,
+                     ClassData{prior = -1.0541605260972757,
                                unseen = -3.2188758248682006,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 23},
                    koData =
-                     ClassData{prior = -0.45425527227759643,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40}}),
+                     ClassData{prior = -0.42845462633286313,
+                               unseen = -3.8066624897703196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 43}}),
        ("<time-of-day> o'clock",
         Classifier{okData =
                      ClassData{prior = -0.4418327522790392, unseen = -3.044522437723423,
@@ -169,45 +163,45 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.3519764231571781, unseen = -4.983606621708336,
+                     ClassData{prior = -0.6061358035703156, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("\20799\31461\33410<part-of-day> <dim time>",
-                                     -3.367295829986474),
+                                     -2.995732273553991),
                                     ("year (numeric with year symbol)<named-month> <day-of-month>",
-                                     -1.7578579175523736),
-                                    ("dayday", -1.6094379124341003),
-                                    ("hourhour", -3.367295829986474),
-                                    ("hourminute", -3.367295829986474),
+                                     -1.7719568419318752),
+                                    ("dayday", -1.8971199848858813),
+                                    ("hourhour", -2.995732273553991),
+                                    ("hourminute", -2.995732273553991),
                                     ("absorption of , after named day<named-month> <day-of-month>",
-                                     -1.6094379124341003),
-                                    ("dayminute", -3.367295829986474),
-                                    ("tonight<time-of-day> o'clock", -3.367295829986474),
+                                     -1.8971199848858813),
+                                    ("dayminute", -2.995732273553991),
+                                    ("tonight<time-of-day> o'clock", -2.995732273553991),
                                     ("<dim time> <part-of-day>relative minutes after|past <integer> (hour-of-day)",
-                                     -3.367295829986474),
-                                    ("yearday", -1.7578579175523736)],
-                               n = 64},
+                                     -2.995732273553991),
+                                    ("yearday", -1.7719568419318752)],
+                               n = 42},
                    koData =
-                     ClassData{prior = -1.215022640512521, unseen = -4.276666119016055,
+                     ClassData{prior = -0.7884573603642702, unseen = -4.465908118654584,
                                likelihoods =
                                  HashMap.fromList
                                    [("\20799\31461\33410<part-of-day> <dim time>",
-                                     -2.065455299705096),
-                                    ("dayhour", -2.653241964607215),
-                                    ("daymonth", -2.1832383353614793),
-                                    ("year (numeric with year symbol)February", -3.164067588373206),
+                                     -2.257122718917288),
+                                    ("dayhour", -2.8449093838194073),
+                                    ("daymonth", -2.374905754573672),
                                     ("<dim time> <part-of-day><time-of-day> o'clock",
-                                     -3.164067588373206),
-                                    ("hourhour", -3.164067588373206),
-                                    ("year (numeric with year symbol)March", -2.653241964607215),
-                                    ("hourminute", -2.653241964607215),
-                                    ("yearmonth", -2.316769727986002),
-                                    ("dayminute", -2.653241964607215),
+                                     -3.355735007585398),
+                                    ("year (numeric with year symbol)month (numeric with month symbol)",
+                                     -1.7462970951512977),
+                                    ("hourhour", -3.355735007585398),
+                                    ("hourminute", -2.8449093838194073),
+                                    ("absorption of , after named daymonth (numeric with month symbol)",
+                                     -2.374905754573672),
+                                    ("yearmonth", -1.7462970951512977),
+                                    ("dayminute", -2.8449093838194073),
                                     ("<dim time> <part-of-day>relative minutes after|past <integer> (hour-of-day)",
-                                     -2.653241964607215),
-                                    ("absorption of , after named dayFebruary",
-                                     -2.1832383353614793)],
-                               n = 27}}),
+                                     -2.8449093838194073)],
+                               n = 35}}),
        ("year (grain)",
         Classifier{okData =
                      ClassData{prior = -0.8209805520698302,
@@ -329,33 +323,33 @@ classifiers
                                n = 50}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.332204510175204,
+                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Octoberordinal (digits)Monday", -1.6863989535702288),
-                                    ("monthday", -0.7308875085427924),
+                                   [("monthday", -0.6931471805599453),
                                     ("month (numeric with month symbol)ordinal (digits)Monday",
-                                     -1.0986122886681098)],
-                               n = 12},
+                                     -0.6931471805599453)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (numeric with month symbol)",
         Classifier{okData =
-                     ClassData{prior = -0.10763066419236544,
-                               unseen = -3.891820298110627,
+                     ClassData{prior = -0.3087354816496133, unseen = -3.951243718581427,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.1631508098056809),
-                                    ("number suffix: \21313", -2.2617630984737906),
-                                    ("integer (0..10)", -0.5753641449035618)],
-                               n = 44},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("number suffix: \21313", -2.322387720290225),
+                                    ("integer (0..10)", -0.5996211225491218)],
+                               n = 47},
                    koData =
-                     ClassData{prior = -2.2823823856765264,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -1.3256697393034558,
+                               unseen = -3.0910424533583156,
                                likelihoods =
-                                 HashMap.fromList [("<number>\20010/\20491", -0.40546510810816444)],
-                               n = 5}}),
+                                 HashMap.fromList
+                                   [("integer (0..10)", -1.9459101490553135),
+                                    ("<number>\20010/\20491", -0.2719337154836418)],
+                               n = 17}}),
        ("week (grain)",
         Classifier{okData =
                      ClassData{prior = -0.8434293836092833,
@@ -469,13 +463,6 @@ classifiers
                                     ("hour", -2.2617630984737906), ("month", -2.772588722239781),
                                     ("minute", -2.772588722239781)],
                                n = 20}}),
-       ("February",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this <cycle>",
         Classifier{okData =
                      ClassData{prior = -1.0185695809945732,
@@ -504,16 +491,16 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<dim time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -4.31748811353631,
+                     ClassData{prior = 0.0, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -0.7487170317147561),
-                                    ("national dayevening|night", -3.20545280453606),
-                                    ("<named-month> <day-of-month>morning", -1.2595426554807467),
-                                    ("\24773\20154\33410evening|night", -3.20545280453606),
-                                    ("\20799\31461\33410afternoon", -3.20545280453606),
-                                    ("Mondaymorning", -2.10684051586795)],
-                               n = 34},
+                                   [("dayhour", -0.7646061445420903),
+                                    ("national dayevening|night", -2.9618307218783095),
+                                    ("<named-month> <day-of-month>morning", -1.4954936530848826),
+                                    ("\24773\20154\33410evening|night", -2.9618307218783095),
+                                    ("\20799\31461\33410afternoon", -2.9618307218783095),
+                                    ("Mondaymorning", -1.8632184332102)],
+                               n = 26},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -551,29 +538,29 @@ classifiers
                      ClassData{prior = -infinity, unseen = -3.044522437723423,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -5.905361848054571,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("week", -2.6837575085331653),
-                                    ("integer (0..10)month (grain)", -2.535337503414892),
-                                    ("integer (0..10)hour (grain)", -3.06941998934515),
-                                    ("<number>\20010/\20491week (grain)", -3.5047380606029956),
-                                    ("second", -3.2635760037861075),
-                                    ("integer (0..10)day (grain)", -3.06941998934515),
-                                    ("number suffix: \21313month (grain)", -4.293195420967266),
-                                    ("integer (0..10)year (grain)", -3.6000482404073204),
-                                    ("<number>\20010/\20491month (grain)", -3.130044611161585),
-                                    ("integer (numeric)year (grain)", -3.1945831322991562),
-                                    ("integer (0..10)second (grain)", -3.2635760037861075),
-                                    ("day", -3.06941998934515), ("year", -2.7245795030534206),
-                                    ("integer (0..10)minute (grain)", -3.06941998934515),
-                                    ("hour", -2.8581108956779433),
-                                    ("integer (0..10)week (grain)", -3.1945831322991562),
-                                    ("month", -1.7754989483562746),
-                                    ("<number>\20010/\20491hour (grain)", -4.293195420967266),
-                                    ("integer (numeric)month (grain)", -3.1945831322991562),
-                                    ("minute", -3.06941998934515)],
-                               n = 173}}),
+                     ClassData{prior = 0.0, unseen = -5.921578419643816,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -2.700018029404946),
+                                    ("integer (0..10)month (grain)", -2.517696472610991),
+                                    ("integer (0..10)hour (grain)", -3.0856805102169305),
+                                    ("<number>\20010/\20491week (grain)", -3.520998581474776),
+                                    ("second", -3.2798365246578878),
+                                    ("integer (0..10)day (grain)", -3.0856805102169305),
+                                    ("number suffix: \21313month (grain)", -4.309455941839047),
+                                    ("integer (0..10)year (grain)", -3.6163087612791007),
+                                    ("<number>\20010/\20491month (grain)", -3.146305132033365),
+                                    ("integer (numeric)year (grain)", -3.2108436531709366),
+                                    ("integer (0..10)second (grain)", -3.2798365246578878),
+                                    ("day", -3.0856805102169305), ("year", -2.740840023925201),
+                                    ("integer (0..10)minute (grain)", -3.0856805102169305),
+                                    ("hour", -2.8743714165497236),
+                                    ("integer (0..10)week (grain)", -3.2108436531709366),
+                                    ("month", -1.7445065843775094),
+                                    ("<number>\20010/\20491hour (grain)", -4.309455941839047),
+                                    ("integer (numeric)month (grain)", -3.0856805102169305),
+                                    ("minute", -3.0856805102169305)],
+                               n = 176}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.70805020110221,
@@ -621,19 +608,21 @@ classifiers
                                n = 10}}),
        ("intersect by \",\"",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -4.110873864173311,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Sunday<named-month> <day-of-month>", -0.7270487322356266),
-                                    ("dayday", -0.7270487322356266)],
-                               n = 28},
+                                   [("Sunday<named-month> <day-of-month>", -0.7576857016975165),
+                                    ("dayday", -0.7576857016975165)],
+                               n = 14},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
+                     ClassData{prior = -1.0986122886681098,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
                                    [("daymonth", -0.8109302162163288),
-                                    ("SundayFebruary", -0.8109302162163288)],
+                                    ("Sundaymonth (numeric with month symbol)",
+                                     -0.8109302162163288)],
                                n = 7}}),
        ("integer with consecutive unit modifiers",
         Classifier{okData =
@@ -691,13 +680,6 @@ classifiers
                                     ("month (numeric with month symbol)", -2.5649493574615367),
                                     ("hour", -0.916290731874155), ("month", -2.5649493574615367)],
                                n = 29}}),
-       ("March",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("the day after tomorrow",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -797,27 +779,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -5.231108616854587,
+                     ClassData{prior = 0.0, unseen = -4.68213122712422,
                                likelihoods =
                                  HashMap.fromList
                                    [("month (numeric with month symbol)integer with consecutive unit modifiers",
-                                     -2.392533329656985),
-                                    ("Marchinteger (0..10)", -3.4339872044851463),
-                                    ("Marchinteger (numeric)", -4.127134385045092),
+                                     -1.83961549040569),
                                     ("month (numeric with month symbol)integer (numeric)",
-                                     -2.517696472610991),
-                                    ("Februaryinteger (0..10)", -3.146305132033365),
+                                     -1.9647786333596962),
                                     ("month (numeric with month symbol)number suffix: \21313",
-                                     -3.146305132033365),
-                                    ("month", -0.7371103039810614),
+                                     -2.5933872927820705),
+                                    ("month", -0.7215851158804788),
                                     ("month (numeric with month symbol)integer (0..10)",
-                                     -2.517696472610991),
-                                    ("Februaryinteger with consecutive unit modifiers",
-                                     -2.392533329656985),
-                                    ("Februarynumber suffix: \21313", -3.146305132033365)],
-                               n = 88},
+                                     -1.9647786333596962)],
+                               n = 51},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.3978952727983707,
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\21171\21160\33410",
         Classifier{okData =
@@ -828,10 +804,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (0..10)",
         Classifier{okData =
-                     ClassData{prior = -0.4090429294560484, unseen = -5.236441962829949,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 186},
+                     ClassData{prior = -0.4072460524791592, unseen = -5.241747015059643,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 187},
                    koData =
-                     ClassData{prior = -1.0914948208992459, unseen = -4.564348191467836,
+                     ClassData{prior = -1.095059887063742, unseen = -4.564348191467836,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 94}}),
        ("last n <cycle>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/ZH_TW.hs b/Duckling/Ranking/Classifiers/ZH_TW.hs
index 675b28bfd..9c7a10962 100644
--- a/Duckling/Ranking/Classifiers/ZH_TW.hs
+++ b/Duckling/Ranking/Classifiers/ZH_TW.hs
@@ -41,10 +41,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5020919437972361, unseen = -3.871201010907891,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 46},
+                     ClassData{prior = -0.48550781578170077,
+                               unseen = -3.912023005428146,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 48},
                    koData =
-                     ClassData{prior = -0.9295359586241757,
+                     ClassData{prior = -0.9555114450274363,
                                unseen = -3.4657359027997265,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 30}}),
        ("the day before yesterday",
@@ -100,22 +101,15 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("October",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = -1.0076405104623831,
+                     ClassData{prior = -1.0541605260972757,
                                unseen = -3.2188758248682006,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 23},
                    koData =
-                     ClassData{prior = -0.45425527227759643,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40}}),
+                     ClassData{prior = -0.42845462633286313,
+                               unseen = -3.8066624897703196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 43}}),
        ("<time-of-day> o'clock",
         Classifier{okData =
                      ClassData{prior = -0.4418327522790392, unseen = -3.044522437723423,
@@ -169,45 +163,45 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.3519764231571781, unseen = -4.983606621708336,
+                     ClassData{prior = -0.6061358035703156, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("\20799\31461\33410<part-of-day> <dim time>",
-                                     -3.367295829986474),
+                                     -2.995732273553991),
                                     ("year (numeric with year symbol)<named-month> <day-of-month>",
-                                     -1.7578579175523736),
-                                    ("dayday", -1.6094379124341003),
-                                    ("hourhour", -3.367295829986474),
-                                    ("hourminute", -3.367295829986474),
+                                     -1.7719568419318752),
+                                    ("dayday", -1.8971199848858813),
+                                    ("hourhour", -2.995732273553991),
+                                    ("hourminute", -2.995732273553991),
                                     ("absorption of , after named day<named-month> <day-of-month>",
-                                     -1.6094379124341003),
-                                    ("dayminute", -3.367295829986474),
-                                    ("tonight<time-of-day> o'clock", -3.367295829986474),
+                                     -1.8971199848858813),
+                                    ("dayminute", -2.995732273553991),
+                                    ("tonight<time-of-day> o'clock", -2.995732273553991),
                                     ("<dim time> <part-of-day>relative minutes after|past <integer> (hour-of-day)",
-                                     -3.367295829986474),
-                                    ("yearday", -1.7578579175523736)],
-                               n = 64},
+                                     -2.995732273553991),
+                                    ("yearday", -1.7719568419318752)],
+                               n = 42},
                    koData =
-                     ClassData{prior = -1.215022640512521, unseen = -4.276666119016055,
+                     ClassData{prior = -0.7884573603642702, unseen = -4.465908118654584,
                                likelihoods =
                                  HashMap.fromList
                                    [("\20799\31461\33410<part-of-day> <dim time>",
-                                     -2.065455299705096),
-                                    ("dayhour", -2.653241964607215),
-                                    ("daymonth", -2.1832383353614793),
-                                    ("year (numeric with year symbol)February", -3.164067588373206),
+                                     -2.257122718917288),
+                                    ("dayhour", -2.8449093838194073),
+                                    ("daymonth", -2.374905754573672),
                                     ("<dim time> <part-of-day><time-of-day> o'clock",
-                                     -3.164067588373206),
-                                    ("hourhour", -3.164067588373206),
-                                    ("year (numeric with year symbol)March", -2.653241964607215),
-                                    ("hourminute", -2.653241964607215),
-                                    ("yearmonth", -2.316769727986002),
-                                    ("dayminute", -2.653241964607215),
+                                     -3.355735007585398),
+                                    ("year (numeric with year symbol)month (numeric with month symbol)",
+                                     -1.7462970951512977),
+                                    ("hourhour", -3.355735007585398),
+                                    ("hourminute", -2.8449093838194073),
+                                    ("absorption of , after named daymonth (numeric with month symbol)",
+                                     -2.374905754573672),
+                                    ("yearmonth", -1.7462970951512977),
+                                    ("dayminute", -2.8449093838194073),
                                     ("<dim time> <part-of-day>relative minutes after|past <integer> (hour-of-day)",
-                                     -2.653241964607215),
-                                    ("absorption of , after named dayFebruary",
-                                     -2.1832383353614793)],
-                               n = 27}}),
+                                     -2.8449093838194073)],
+                               n = 35}}),
        ("year (grain)",
         Classifier{okData =
                      ClassData{prior = -0.8209805520698302,
@@ -329,33 +323,33 @@ classifiers
                                n = 50}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.332204510175204,
+                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Octoberordinal (digits)Monday", -1.6863989535702288),
-                                    ("monthday", -0.7308875085427924),
+                                   [("monthday", -0.6931471805599453),
                                     ("month (numeric with month symbol)ordinal (digits)Monday",
-                                     -1.0986122886681098)],
-                               n = 12},
+                                     -0.6931471805599453)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (numeric with month symbol)",
         Classifier{okData =
-                     ClassData{prior = -0.10763066419236544,
-                               unseen = -3.891820298110627,
+                     ClassData{prior = -0.3087354816496133, unseen = -3.951243718581427,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.1631508098056809),
-                                    ("number suffix: \21313", -2.2617630984737906),
-                                    ("integer (0..10)", -0.5753641449035618)],
-                               n = 44},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("number suffix: \21313", -2.322387720290225),
+                                    ("integer (0..10)", -0.5996211225491218)],
+                               n = 47},
                    koData =
-                     ClassData{prior = -2.2823823856765264,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -1.3256697393034558,
+                               unseen = -3.0910424533583156,
                                likelihoods =
-                                 HashMap.fromList [("<number>\20010/\20491", -0.40546510810816444)],
-                               n = 5}}),
+                                 HashMap.fromList
+                                   [("integer (0..10)", -1.9459101490553135),
+                                    ("<number>\20010/\20491", -0.2719337154836418)],
+                               n = 17}}),
        ("week (grain)",
         Classifier{okData =
                      ClassData{prior = -0.8434293836092833,
@@ -469,13 +463,6 @@ classifiers
                                     ("hour", -2.2617630984737906), ("month", -2.772588722239781),
                                     ("minute", -2.772588722239781)],
                                n = 20}}),
-       ("February",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this <cycle>",
         Classifier{okData =
                      ClassData{prior = -1.0185695809945732,
@@ -504,16 +491,16 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<dim time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -4.31748811353631,
+                     ClassData{prior = 0.0, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -0.7487170317147561),
-                                    ("national dayevening|night", -3.20545280453606),
-                                    ("<named-month> <day-of-month>morning", -1.2595426554807467),
-                                    ("\24773\20154\33410evening|night", -3.20545280453606),
-                                    ("\20799\31461\33410afternoon", -3.20545280453606),
-                                    ("Mondaymorning", -2.10684051586795)],
-                               n = 34},
+                                   [("dayhour", -0.7646061445420903),
+                                    ("national dayevening|night", -2.9618307218783095),
+                                    ("<named-month> <day-of-month>morning", -1.4954936530848826),
+                                    ("\24773\20154\33410evening|night", -2.9618307218783095),
+                                    ("\20799\31461\33410afternoon", -2.9618307218783095),
+                                    ("Mondaymorning", -1.8632184332102)],
+                               n = 26},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -551,29 +538,29 @@ classifiers
                      ClassData{prior = -infinity, unseen = -3.044522437723423,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -5.905361848054571,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("week", -2.6837575085331653),
-                                    ("integer (0..10)month (grain)", -2.535337503414892),
-                                    ("integer (0..10)hour (grain)", -3.06941998934515),
-                                    ("<number>\20010/\20491week (grain)", -3.5047380606029956),
-                                    ("second", -3.2635760037861075),
-                                    ("integer (0..10)day (grain)", -3.06941998934515),
-                                    ("number suffix: \21313month (grain)", -4.293195420967266),
-                                    ("integer (0..10)year (grain)", -3.6000482404073204),
-                                    ("<number>\20010/\20491month (grain)", -3.130044611161585),
-                                    ("integer (numeric)year (grain)", -3.1945831322991562),
-                                    ("integer (0..10)second (grain)", -3.2635760037861075),
-                                    ("day", -3.06941998934515), ("year", -2.7245795030534206),
-                                    ("integer (0..10)minute (grain)", -3.06941998934515),
-                                    ("hour", -2.8581108956779433),
-                                    ("integer (0..10)week (grain)", -3.1945831322991562),
-                                    ("month", -1.7754989483562746),
-                                    ("<number>\20010/\20491hour (grain)", -4.293195420967266),
-                                    ("integer (numeric)month (grain)", -3.1945831322991562),
-                                    ("minute", -3.06941998934515)],
-                               n = 173}}),
+                     ClassData{prior = 0.0, unseen = -5.921578419643816,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -2.700018029404946),
+                                    ("integer (0..10)month (grain)", -2.517696472610991),
+                                    ("integer (0..10)hour (grain)", -3.0856805102169305),
+                                    ("<number>\20010/\20491week (grain)", -3.520998581474776),
+                                    ("second", -3.2798365246578878),
+                                    ("integer (0..10)day (grain)", -3.0856805102169305),
+                                    ("number suffix: \21313month (grain)", -4.309455941839047),
+                                    ("integer (0..10)year (grain)", -3.6163087612791007),
+                                    ("<number>\20010/\20491month (grain)", -3.146305132033365),
+                                    ("integer (numeric)year (grain)", -3.2108436531709366),
+                                    ("integer (0..10)second (grain)", -3.2798365246578878),
+                                    ("day", -3.0856805102169305), ("year", -2.740840023925201),
+                                    ("integer (0..10)minute (grain)", -3.0856805102169305),
+                                    ("hour", -2.8743714165497236),
+                                    ("integer (0..10)week (grain)", -3.2108436531709366),
+                                    ("month", -1.7445065843775094),
+                                    ("<number>\20010/\20491hour (grain)", -4.309455941839047),
+                                    ("integer (numeric)month (grain)", -3.0856805102169305),
+                                    ("minute", -3.0856805102169305)],
+                               n = 176}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.70805020110221,
@@ -621,19 +608,21 @@ classifiers
                                n = 10}}),
        ("intersect by \",\"",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -4.110873864173311,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Sunday<named-month> <day-of-month>", -0.7270487322356266),
-                                    ("dayday", -0.7270487322356266)],
-                               n = 28},
+                                   [("Sunday<named-month> <day-of-month>", -0.7576857016975165),
+                                    ("dayday", -0.7576857016975165)],
+                               n = 14},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
+                     ClassData{prior = -1.0986122886681098,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
                                    [("daymonth", -0.8109302162163288),
-                                    ("SundayFebruary", -0.8109302162163288)],
+                                    ("Sundaymonth (numeric with month symbol)",
+                                     -0.8109302162163288)],
                                n = 7}}),
        ("integer with consecutive unit modifiers",
         Classifier{okData =
@@ -691,13 +680,6 @@ classifiers
                                     ("month (numeric with month symbol)", -2.5649493574615367),
                                     ("hour", -0.916290731874155), ("month", -2.5649493574615367)],
                                n = 29}}),
-       ("March",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("the day after tomorrow",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -797,27 +779,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -5.231108616854587,
+                     ClassData{prior = 0.0, unseen = -4.68213122712422,
                                likelihoods =
                                  HashMap.fromList
                                    [("month (numeric with month symbol)integer with consecutive unit modifiers",
-                                     -2.392533329656985),
-                                    ("Marchinteger (0..10)", -3.4339872044851463),
-                                    ("Marchinteger (numeric)", -4.127134385045092),
+                                     -1.83961549040569),
                                     ("month (numeric with month symbol)integer (numeric)",
-                                     -2.517696472610991),
-                                    ("Februaryinteger (0..10)", -3.146305132033365),
+                                     -1.9647786333596962),
                                     ("month (numeric with month symbol)number suffix: \21313",
-                                     -3.146305132033365),
-                                    ("month", -0.7371103039810614),
+                                     -2.5933872927820705),
+                                    ("month", -0.7215851158804788),
                                     ("month (numeric with month symbol)integer (0..10)",
-                                     -2.517696472610991),
-                                    ("Februaryinteger with consecutive unit modifiers",
-                                     -2.392533329656985),
-                                    ("Februarynumber suffix: \21313", -3.146305132033365)],
-                               n = 88},
+                                     -1.9647786333596962)],
+                               n = 51},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.3978952727983707,
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\21171\21160\33410",
         Classifier{okData =
@@ -828,10 +804,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (0..10)",
         Classifier{okData =
-                     ClassData{prior = -0.4090429294560484, unseen = -5.236441962829949,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 186},
+                     ClassData{prior = -0.4072460524791592, unseen = -5.241747015059643,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 187},
                    koData =
-                     ClassData{prior = -1.0914948208992459, unseen = -4.564348191467836,
+                     ClassData{prior = -1.095059887063742, unseen = -4.564348191467836,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 94}}),
        ("last n <cycle>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/ZH_XX.hs b/Duckling/Ranking/Classifiers/ZH_XX.hs
index 5b99e87d4..8fc0007b2 100644
--- a/Duckling/Ranking/Classifiers/ZH_XX.hs
+++ b/Duckling/Ranking/Classifiers/ZH_XX.hs
@@ -41,10 +41,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5020919437972361, unseen = -3.871201010907891,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 46},
+                     ClassData{prior = -0.48550781578170077,
+                               unseen = -3.912023005428146,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 48},
                    koData =
-                     ClassData{prior = -0.9295359586241757,
+                     ClassData{prior = -0.9555114450274363,
                                unseen = -3.4657359027997265,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 30}}),
        ("the day before yesterday",
@@ -100,22 +101,15 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("October",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = -1.0076405104623831,
+                     ClassData{prior = -1.0541605260972757,
                                unseen = -3.2188758248682006,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 23},
                    koData =
-                     ClassData{prior = -0.45425527227759643,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40}}),
+                     ClassData{prior = -0.42845462633286313,
+                               unseen = -3.8066624897703196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 43}}),
        ("<time-of-day> o'clock",
         Classifier{okData =
                      ClassData{prior = -0.4418327522790392, unseen = -3.044522437723423,
@@ -162,45 +156,45 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.3519764231571781, unseen = -4.983606621708336,
+                     ClassData{prior = -0.6061358035703156, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("\20799\31461\33410<part-of-day> <dim time>",
-                                     -3.367295829986474),
+                                     -2.995732273553991),
                                     ("year (numeric with year symbol)<named-month> <day-of-month>",
-                                     -1.7578579175523736),
-                                    ("dayday", -1.6094379124341003),
-                                    ("hourhour", -3.367295829986474),
-                                    ("hourminute", -3.367295829986474),
+                                     -1.7719568419318752),
+                                    ("dayday", -1.8971199848858813),
+                                    ("hourhour", -2.995732273553991),
+                                    ("hourminute", -2.995732273553991),
                                     ("absorption of , after named day<named-month> <day-of-month>",
-                                     -1.6094379124341003),
-                                    ("dayminute", -3.367295829986474),
-                                    ("tonight<time-of-day> o'clock", -3.367295829986474),
+                                     -1.8971199848858813),
+                                    ("dayminute", -2.995732273553991),
+                                    ("tonight<time-of-day> o'clock", -2.995732273553991),
                                     ("<dim time> <part-of-day>relative minutes after|past <integer> (hour-of-day)",
-                                     -3.367295829986474),
-                                    ("yearday", -1.7578579175523736)],
-                               n = 64},
+                                     -2.995732273553991),
+                                    ("yearday", -1.7719568419318752)],
+                               n = 42},
                    koData =
-                     ClassData{prior = -1.215022640512521, unseen = -4.276666119016055,
+                     ClassData{prior = -0.7884573603642702, unseen = -4.465908118654584,
                                likelihoods =
                                  HashMap.fromList
                                    [("\20799\31461\33410<part-of-day> <dim time>",
-                                     -2.065455299705096),
-                                    ("dayhour", -2.653241964607215),
-                                    ("daymonth", -2.1832383353614793),
-                                    ("year (numeric with year symbol)February", -3.164067588373206),
+                                     -2.257122718917288),
+                                    ("dayhour", -2.8449093838194073),
+                                    ("daymonth", -2.374905754573672),
                                     ("<dim time> <part-of-day><time-of-day> o'clock",
-                                     -3.164067588373206),
-                                    ("hourhour", -3.164067588373206),
-                                    ("year (numeric with year symbol)March", -2.653241964607215),
-                                    ("hourminute", -2.653241964607215),
-                                    ("yearmonth", -2.316769727986002),
-                                    ("dayminute", -2.653241964607215),
+                                     -3.355735007585398),
+                                    ("year (numeric with year symbol)month (numeric with month symbol)",
+                                     -1.7462970951512977),
+                                    ("hourhour", -3.355735007585398),
+                                    ("hourminute", -2.8449093838194073),
+                                    ("absorption of , after named daymonth (numeric with month symbol)",
+                                     -2.374905754573672),
+                                    ("yearmonth", -1.7462970951512977),
+                                    ("dayminute", -2.8449093838194073),
                                     ("<dim time> <part-of-day>relative minutes after|past <integer> (hour-of-day)",
-                                     -2.653241964607215),
-                                    ("absorption of , after named dayFebruary",
-                                     -2.1832383353614793)],
-                               n = 27}}),
+                                     -2.8449093838194073)],
+                               n = 35}}),
        ("year (grain)",
         Classifier{okData =
                      ClassData{prior = -0.8209805520698302,
@@ -322,33 +316,33 @@ classifiers
                                n = 50}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.332204510175204,
+                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Octoberordinal (digits)Monday", -1.6863989535702288),
-                                    ("monthday", -0.7308875085427924),
+                                   [("monthday", -0.6931471805599453),
                                     ("month (numeric with month symbol)ordinal (digits)Monday",
-                                     -1.0986122886681098)],
-                               n = 12},
+                                     -0.6931471805599453)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (numeric with month symbol)",
         Classifier{okData =
-                     ClassData{prior = -0.10763066419236544,
-                               unseen = -3.891820298110627,
+                     ClassData{prior = -0.3087354816496133, unseen = -3.951243718581427,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.1631508098056809),
-                                    ("number suffix: \21313", -2.2617630984737906),
-                                    ("integer (0..10)", -0.5753641449035618)],
-                               n = 44},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("number suffix: \21313", -2.322387720290225),
+                                    ("integer (0..10)", -0.5996211225491218)],
+                               n = 47},
                    koData =
-                     ClassData{prior = -2.2823823856765264,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -1.3256697393034558,
+                               unseen = -3.0910424533583156,
                                likelihoods =
-                                 HashMap.fromList [("<number>\20010/\20491", -0.40546510810816444)],
-                               n = 5}}),
+                                 HashMap.fromList
+                                   [("integer (0..10)", -1.9459101490553135),
+                                    ("<number>\20010/\20491", -0.2719337154836418)],
+                               n = 17}}),
        ("week (grain)",
         Classifier{okData =
                      ClassData{prior = -0.8434293836092833,
@@ -462,13 +456,6 @@ classifiers
                                     ("hour", -2.2617630984737906), ("month", -2.772588722239781),
                                     ("minute", -2.772588722239781)],
                                n = 20}}),
-       ("February",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this <cycle>",
         Classifier{okData =
                      ClassData{prior = -1.0185695809945732,
@@ -497,15 +484,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<dim time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -4.248495242049359,
+                     ClassData{prior = 0.0, unseen = -3.9889840465642745,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -0.7375989431307791),
-                                    ("<named-month> <day-of-month>morning", -1.1895840668738362),
-                                    ("\24773\20154\33410evening|night", -3.1354942159291497),
-                                    ("\20799\31461\33410afternoon", -3.1354942159291497),
-                                    ("Mondaymorning", -2.03688192726104)],
-                               n = 32},
+                                   [("dayhour", -0.7514160886839211),
+                                    ("<named-month> <day-of-month>morning", -1.405342556090585),
+                                    ("\24773\20154\33410evening|night", -2.871679624884012),
+                                    ("\20799\31461\33410afternoon", -2.871679624884012),
+                                    ("Mondaymorning", -1.7730673362159024)],
+                               n = 24},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -543,29 +530,29 @@ classifiers
                      ClassData{prior = -infinity, unseen = -3.044522437723423,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -5.905361848054571,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("week", -2.6837575085331653),
-                                    ("integer (0..10)month (grain)", -2.535337503414892),
-                                    ("integer (0..10)hour (grain)", -3.06941998934515),
-                                    ("<number>\20010/\20491week (grain)", -3.5047380606029956),
-                                    ("second", -3.2635760037861075),
-                                    ("integer (0..10)day (grain)", -3.06941998934515),
-                                    ("number suffix: \21313month (grain)", -4.293195420967266),
-                                    ("integer (0..10)year (grain)", -3.6000482404073204),
-                                    ("<number>\20010/\20491month (grain)", -3.130044611161585),
-                                    ("integer (numeric)year (grain)", -3.1945831322991562),
-                                    ("integer (0..10)second (grain)", -3.2635760037861075),
-                                    ("day", -3.06941998934515), ("year", -2.7245795030534206),
-                                    ("integer (0..10)minute (grain)", -3.06941998934515),
-                                    ("hour", -2.8581108956779433),
-                                    ("integer (0..10)week (grain)", -3.1945831322991562),
-                                    ("month", -1.7754989483562746),
-                                    ("<number>\20010/\20491hour (grain)", -4.293195420967266),
-                                    ("integer (numeric)month (grain)", -3.1945831322991562),
-                                    ("minute", -3.06941998934515)],
-                               n = 173}}),
+                     ClassData{prior = 0.0, unseen = -5.921578419643816,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -2.700018029404946),
+                                    ("integer (0..10)month (grain)", -2.517696472610991),
+                                    ("integer (0..10)hour (grain)", -3.0856805102169305),
+                                    ("<number>\20010/\20491week (grain)", -3.520998581474776),
+                                    ("second", -3.2798365246578878),
+                                    ("integer (0..10)day (grain)", -3.0856805102169305),
+                                    ("number suffix: \21313month (grain)", -4.309455941839047),
+                                    ("integer (0..10)year (grain)", -3.6163087612791007),
+                                    ("<number>\20010/\20491month (grain)", -3.146305132033365),
+                                    ("integer (numeric)year (grain)", -3.2108436531709366),
+                                    ("integer (0..10)second (grain)", -3.2798365246578878),
+                                    ("day", -3.0856805102169305), ("year", -2.740840023925201),
+                                    ("integer (0..10)minute (grain)", -3.0856805102169305),
+                                    ("hour", -2.8743714165497236),
+                                    ("integer (0..10)week (grain)", -3.2108436531709366),
+                                    ("month", -1.7445065843775094),
+                                    ("<number>\20010/\20491hour (grain)", -4.309455941839047),
+                                    ("integer (numeric)month (grain)", -3.0856805102169305),
+                                    ("minute", -3.0856805102169305)],
+                               n = 176}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.70805020110221,
@@ -613,19 +600,21 @@ classifiers
                                n = 10}}),
        ("intersect by \",\"",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -4.110873864173311,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Sunday<named-month> <day-of-month>", -0.7270487322356266),
-                                    ("dayday", -0.7270487322356266)],
-                               n = 28},
+                                   [("Sunday<named-month> <day-of-month>", -0.7576857016975165),
+                                    ("dayday", -0.7576857016975165)],
+                               n = 14},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
+                     ClassData{prior = -1.0986122886681098,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
                                    [("daymonth", -0.8109302162163288),
-                                    ("SundayFebruary", -0.8109302162163288)],
+                                    ("Sundaymonth (numeric with month symbol)",
+                                     -0.8109302162163288)],
                                n = 7}}),
        ("integer with consecutive unit modifiers",
         Classifier{okData =
@@ -683,13 +672,6 @@ classifiers
                                     ("month (numeric with month symbol)", -2.5649493574615367),
                                     ("hour", -0.916290731874155), ("month", -2.5649493574615367)],
                                n = 29}}),
-       ("March",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("the day after tomorrow",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -789,27 +771,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -5.231108616854587,
+                     ClassData{prior = 0.0, unseen = -4.68213122712422,
                                likelihoods =
                                  HashMap.fromList
                                    [("month (numeric with month symbol)integer with consecutive unit modifiers",
-                                     -2.392533329656985),
-                                    ("Marchinteger (0..10)", -3.4339872044851463),
-                                    ("Marchinteger (numeric)", -4.127134385045092),
+                                     -1.83961549040569),
                                     ("month (numeric with month symbol)integer (numeric)",
-                                     -2.517696472610991),
-                                    ("Februaryinteger (0..10)", -3.146305132033365),
+                                     -1.9647786333596962),
                                     ("month (numeric with month symbol)number suffix: \21313",
-                                     -3.146305132033365),
-                                    ("month", -0.7371103039810614),
+                                     -2.5933872927820705),
+                                    ("month", -0.7215851158804788),
                                     ("month (numeric with month symbol)integer (0..10)",
-                                     -2.517696472610991),
-                                    ("Februaryinteger with consecutive unit modifiers",
-                                     -2.392533329656985),
-                                    ("Februarynumber suffix: \21313", -3.146305132033365)],
-                               n = 88},
+                                     -1.9647786333596962)],
+                               n = 51},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.3978952727983707,
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\21171\21160\33410",
         Classifier{okData =
@@ -820,10 +796,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (0..10)",
         Classifier{okData =
-                     ClassData{prior = -0.4090429294560484, unseen = -5.236441962829949,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 186},
+                     ClassData{prior = -0.4072460524791592, unseen = -5.241747015059643,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 187},
                    koData =
-                     ClassData{prior = -1.0914948208992459, unseen = -4.564348191467836,
+                     ClassData{prior = -1.095059887063742, unseen = -4.564348191467836,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 94}}),
        ("last n <cycle>",
         Classifier{okData =
diff --git a/Duckling/Time/ZH/Corpus.hs b/Duckling/Time/ZH/Corpus.hs
index f3b55233b..8411421e7 100644
--- a/Duckling/Time/ZH/Corpus.hs
+++ b/Duckling/Time/ZH/Corpus.hs
@@ -275,26 +275,29 @@ allExamples = concat
              , "下礼拜"
              , "下禮拜"
              ]
-  , examples (datetime (2013, 1, 0, 0, 0, 0) Month)
+  , examples (datetime (2013, 1, 1, 0, 0, 0) Month)
              [ "上月"
              , "上个月"
              , "上個月"
              ]
-  , examples (datetime (2013, 3, 0, 0, 0, 0) Month)
+  , examples (datetime (2013, 3, 1, 0, 0, 0) Month)
              [ "下月"
              , "下个月"
              , "下個月"
+             , "3月"
+             , "3月份"
+             , "三月"
              ]
-  , examples (datetime (2012, 0, 0, 0, 0, 0) Year)
+  , examples (datetime (2012, 1, 1, 0, 0, 0) Year)
              [ "去年"
              , "上年"
              ]
-  , examples (datetime (2013, 0, 0, 0, 0, 0) Year)
+  , examples (datetime (2013, 1, 1, 0, 0, 0) Year)
              [ "今年"
              , "这一年"
              , "這一年"
              ]
-  , examples (datetime (2014, 0, 0, 0, 0, 0) Year)
+  , examples (datetime (2014, 1, 1, 0, 0, 0) Year)
              [ "明年"
              , "下年"
              ]
diff --git a/Duckling/Time/ZH/Rules.hs b/Duckling/Time/ZH/Rules.hs
index 0026a3dcc..ec2f88f50 100644
--- a/Duckling/Time/ZH/Rules.hs
+++ b/Duckling/Time/ZH/Rules.hs
@@ -764,12 +764,12 @@ ruleMonthNumericWithMonthSymbol = Rule
   { name = "month (numeric with month symbol)"
   , pattern =
     [ Predicate $ isIntegerBetween 1 12
-    , regex "月"
+    , regex "月(份)?"
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
         v <- getIntValue token
-        tt . mkLatent $ month v
+        tt . mkOkForThisNext $ month v
       _ -> Nothing
   }
 
@@ -892,22 +892,6 @@ ruleDaysOfWeek = mkRuleDaysOfWeek
   , ( "Sunday", "星期日|星期天|礼拜天|周日|禮拜天|週日|禮拜日" )
   ]
 
-ruleMonths :: [Rule]
-ruleMonths = mkRuleMonths
-  [ ( "January", "一月(份)?" )
-  , ( "February", "二月(份)?" )
-  , ( "March", "三月(份)?" )
-  , ( "April", "四月(份)?" )
-  , ( "May", "五月(份)?" )
-  , ( "June", "六月(份)?" )
-  , ( "July", "七月(份)?" )
-  , ( "August", "八月(份)?" )
-  , ( "September", "九月(份)?" )
-  , ( "October", "十月(份)?" )
-  , ( "November", "十一月(份)?" )
-  , ( "December", "十二月(份)?" )
-  ]
-
 rulePeriodicHolidays :: [Rule]
 rulePeriodicHolidays = mkRuleHolidays
   -- Fixed dates, year over year
@@ -1039,5 +1023,4 @@ rules =
   , ruleTimezone
   ]
   ++ ruleDaysOfWeek
-  ++ ruleMonths
   ++ rulePeriodicHolidays