From 72f45e8e2c7385f41f2f8b1f063e7b5daa6dca94 Mon Sep 17 00:00:00 2001
From: Daniel Cartwright <chessai@fb.com>
Date: Fri, 27 Aug 2021 12:10:58 -0700
Subject: [PATCH] Recognise hh:mm:ss as not an interval

Summary: An interval regex was overzealous and matching too much, so `hh:mm:ss` was getting parsed as an interval instead of a time.

Reviewed By: patapizza

Differential Revision: D30608223

fbshipit-source-id: b24c18146070f15ada80b9401e67f0c0aefef7d8
---
 Duckling/Ranking/Classifiers/EN_AU.hs | 160 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_BZ.hs | 160 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_CA.hs | 163 ++++++++++++--------------
 Duckling/Ranking/Classifiers/EN_GB.hs | 162 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_IE.hs | 160 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_IN.hs | 160 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_JM.hs | 160 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_NZ.hs | 160 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_PH.hs | 160 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_TT.hs | 160 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_US.hs | 163 ++++++++++++--------------
 Duckling/Ranking/Classifiers/EN_XX.hs | 163 ++++++++++++--------------
 Duckling/Ranking/Classifiers/EN_ZA.hs | 160 ++++++++++++-------------
 Duckling/Time/EN/Corpus.hs            |   3 +
 Duckling/Time/EN/Rules.hs             |   2 +-
 15 files changed, 1018 insertions(+), 1078 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/EN_AU.hs b/Duckling/Ranking/Classifiers/EN_AU.hs
index 6b3a71d1..7fec8cc2 100644
--- a/Duckling/Ranking/Classifiers/EN_AU.hs
+++ b/Duckling/Ranking/Classifiers/EN_AU.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.53208562319284, unseen = -6.186208623900494,
+                     ClassData{prior = -0.5357197883070597, unseen = -6.186208623900494,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 484},
                    koData =
-                     ClassData{prior = -0.8852249122992647, unseen = -5.834810737062605,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 340}}),
+                     ClassData{prior = -0.8800742478577515, unseen = -5.84354441703136,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 343}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1845,8 +1845,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2187,8 +2187,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2196,13 +2195,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.42050298547270487,
@@ -2434,19 +2428,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6970764586998348, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7009903580209712, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.689233281238809, unseen = -4.875197323201151,
+                     ClassData{prior = -0.6853650401178903, unseen = -4.882801922586371,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15800424914324832),
-                                    ("integer (0..19)", -1.923095471289142)],
-                               n = 128}}),
+                                   [("integer (numeric)", -0.15669845190605702),
+                                    ("integer (0..19)", -1.9307583440347111)],
+                               n = 129}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2551,41 +2545,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2584829177595186, unseen = -5.697093486505405,
+                     ClassData{prior = -0.262364264467491, unseen = -5.703782474656201,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7478219897473863),
-                                    ("integer after|past <hour-of-day>", -4.307437777682809),
-                                    ("at <time-of-day>", -2.3978952727983707),
-                                    ("<time-of-day> o'clock", -4.59511985013459),
-                                    ("half after|past <hour-of-day>", -4.59511985013459),
-                                    ("second", -5.000584958242754),
-                                    ("hh:mm:ss", -5.000584958242754),
-                                    ("<hour-of-day> <integer>", -4.084294226368599),
+                                   [("from|since|after <time>", -3.7545334243353734),
+                                    ("integer after|past <hour-of-day>", -4.314149212270796),
+                                    ("at <time-of-day>", -2.4046067073863573),
+                                    ("<time-of-day> o'clock", -4.601831284722577),
+                                    ("half after|past <hour-of-day>", -4.601831284722577),
+                                    ("second", -4.601831284722577),
+                                    ("hh:mm:ss", -4.601831284722577),
+                                    ("<hour-of-day> <integer>", -4.091005660956586),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.000584958242754),
-                                    ("time-of-day (latent)", -1.6863989535702288),
-                                    ("hhmm (latent)", -5.000584958242754),
-                                    ("hh:mm", -2.3978952727983707),
-                                    ("quarter after|past <hour-of-day>", -3.4965075614664802),
-                                    ("until <time>", -4.307437777682809),
-                                    ("about|exactly <time-of-day>", -5.000584958242754),
-                                    ("hour", -1.2393848425491918),
-                                    ("<time-of-day> sharp|exactly", -5.000584958242754),
-                                    ("minute", -1.7047480922384253)],
-                               n = 139},
+                                     -5.0072963928307415),
+                                    ("time-of-day (latent)", -1.6931103881582155),
+                                    ("hhmm (latent)", -5.0072963928307415),
+                                    ("hh:mm", -2.4046067073863573),
+                                    ("quarter after|past <hour-of-day>", -3.503218996054467),
+                                    ("until <time>", -4.314149212270796),
+                                    ("about|exactly <time-of-day>", -5.0072963928307415),
+                                    ("hour", -1.2460962771371789),
+                                    ("<time-of-day> sharp|exactly", -5.0072963928307415),
+                                    ("minute", -1.7114595268264121)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.4793847841859027, unseen = -4.624972813284271,
+                     ClassData{prior = -1.466337068793427, unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.228826155721369),
-                                    ("from|since|after <time>", -3.228826155721369),
-                                    ("at <time-of-day>", -3.5165082281731497),
-                                    ("time-of-day (latent)", -1.1811333123561132),
-                                    ("hh:mm", -3.5165082281731497),
-                                    ("until <time>", -3.9219733362813143),
-                                    ("hour", -1.0316015783851495), ("minute", -2.6692103677859462)],
-                               n = 41}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
+                                    ("from|since|after <time>", -3.248434627109745),
+                                    ("at <time-of-day>", -3.536116699561526),
+                                    ("time-of-day (latent)", -1.1689930854299093),
+                                    ("hh:mm", -3.536116699561526),
+                                    ("until <time>", -3.9415818076696905),
+                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
+                               n = 42}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2717,12 +2711,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12260232209233239,
+                     ClassData{prior = -0.13534134786976212,
                                unseen = -4.2626798770413155,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+                     ClassData{prior = -2.0668627594729756,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3612,7 +3607,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.116469906068116, unseen = -4.672828834461907,
+                     ClassData{prior = -1.1340142157190256, unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.054001181677967),
@@ -3635,46 +3630,47 @@ classifiers
                                     ("<time-of-day> am|pm<time-of-day> am|pm", -3.054001181677967)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.3966544784260094, unseen = -5.220355825078324,
+                     ClassData{prior = -0.38822330167365837,
+                               unseen = -5.241747015059643,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.116323468940876),
-                                    ("<time> timezonehhhmm", -4.116323468940876),
+                                   [("hhhmm<time> timezone", -4.137829674161839),
+                                    ("<time> timezonehhhmm", -4.137829674161839),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.5217885770490405),
-                                    ("until <time>time-of-day (latent)", -3.2690256085536724),
-                                    ("from|since|after <time>hh:mm", -4.5217885770490405),
-                                    ("hh:mmtime-of-day (latent)", -2.5068855565067754),
-                                    ("hh:mm<time-of-day> am|pm", -3.2690256085536724),
-                                    ("minuteminute", -2.4423470353692043),
+                                     -4.543294782270004),
+                                    ("until <time>time-of-day (latent)", -3.2905318137746358),
+                                    ("from|since|after <time>hh:mm", -4.543294782270004),
+                                    ("hh:mmtime-of-day (latent)", -2.463853240590168),
+                                    ("hh:mm<time-of-day> am|pm", -3.1570004211501135),
+                                    ("minuteminute", -2.463853240590168),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.6054978451748854),
-                                    ("hh:mmhh:mm", -3.828641396489095),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.116323468940876),
-                                    ("hhhmmhhhmm", -4.116323468940876),
-                                    ("hourhour", -2.03688192726104),
+                                     -3.6270040503958487),
+                                    ("hh:mmhh:mm", -3.8501476017100584),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.137829674161839),
+                                    ("hhhmmhhhmm", -4.137829674161839),
+                                    ("hourhour", -2.0583881324820035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.828641396489095),
-                                    ("hourminute", -3.4231762883809305),
-                                    ("minutehour", -1.6885752329928243),
-                                    ("<time> timezonehh:mm", -4.5217885770490405),
-                                    ("hh:mm<time> timezone", -4.5217885770490405),
-                                    ("hhhmmtime-of-day (latent)", -3.828641396489095),
-                                    ("until <time><time-of-day> am|pm", -4.116323468940876),
+                                     -3.8501476017100584),
+                                    ("hourminute", -3.4446824936018943),
+                                    ("minutehour", -1.6529230243738393),
+                                    ("<time> timezonehh:mm", -4.543294782270004),
+                                    ("hh:mm<time> timezone", -4.543294782270004),
+                                    ("hhhmmtime-of-day (latent)", -3.8501476017100584),
+                                    ("until <time><time-of-day> am|pm", -4.137829674161839),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
-                                    ("<time-of-day> am|pmhh:mm", -4.5217885770490405),
+                                     -4.543294782270004),
+                                    ("<time-of-day> am|pmhh:mm", -4.543294782270004),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.828641396489095),
+                                     -3.8501476017100584),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.0177111802727663),
-                                    ("at <time-of-day>time-of-day (latent)", -3.828641396489095),
-                                    ("<time> timezonetime-of-day (latent)", -3.828641396489095),
+                                     -3.0392173854937297),
+                                    ("at <time-of-day>time-of-day (latent)", -3.8501476017100584),
+                                    ("<time> timezonetime-of-day (latent)", -3.8501476017100584),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
+                                     -4.543294782270004),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.828641396489095)],
-                               n = 76}}),
+                                     -3.8501476017100584)],
+                               n = 78}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_BZ.hs b/Duckling/Ranking/Classifiers/EN_BZ.hs
index b5076673..0f053540 100644
--- a/Duckling/Ranking/Classifiers/EN_BZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_BZ.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.53208562319284, unseen = -6.186208623900494,
+                     ClassData{prior = -0.5357197883070597, unseen = -6.186208623900494,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 484},
                    koData =
-                     ClassData{prior = -0.8852249122992647, unseen = -5.834810737062605,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 340}}),
+                     ClassData{prior = -0.8800742478577515, unseen = -5.84354441703136,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 343}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1845,8 +1845,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2187,8 +2187,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2196,13 +2195,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.42050298547270487,
@@ -2434,19 +2428,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6970764586998348, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7009903580209712, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.689233281238809, unseen = -4.875197323201151,
+                     ClassData{prior = -0.6853650401178903, unseen = -4.882801922586371,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15800424914324832),
-                                    ("integer (0..19)", -1.923095471289142)],
-                               n = 128}}),
+                                   [("integer (numeric)", -0.15669845190605702),
+                                    ("integer (0..19)", -1.9307583440347111)],
+                               n = 129}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2551,41 +2545,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2584829177595186, unseen = -5.697093486505405,
+                     ClassData{prior = -0.262364264467491, unseen = -5.703782474656201,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7478219897473863),
-                                    ("integer after|past <hour-of-day>", -4.307437777682809),
-                                    ("at <time-of-day>", -2.3978952727983707),
-                                    ("<time-of-day> o'clock", -4.59511985013459),
-                                    ("half after|past <hour-of-day>", -4.59511985013459),
-                                    ("second", -5.000584958242754),
-                                    ("hh:mm:ss", -5.000584958242754),
-                                    ("<hour-of-day> <integer>", -4.084294226368599),
+                                   [("from|since|after <time>", -3.7545334243353734),
+                                    ("integer after|past <hour-of-day>", -4.314149212270796),
+                                    ("at <time-of-day>", -2.4046067073863573),
+                                    ("<time-of-day> o'clock", -4.601831284722577),
+                                    ("half after|past <hour-of-day>", -4.601831284722577),
+                                    ("second", -4.601831284722577),
+                                    ("hh:mm:ss", -4.601831284722577),
+                                    ("<hour-of-day> <integer>", -4.091005660956586),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.000584958242754),
-                                    ("time-of-day (latent)", -1.6863989535702288),
-                                    ("hhmm (latent)", -5.000584958242754),
-                                    ("hh:mm", -2.3978952727983707),
-                                    ("quarter after|past <hour-of-day>", -3.4965075614664802),
-                                    ("until <time>", -4.307437777682809),
-                                    ("about|exactly <time-of-day>", -5.000584958242754),
-                                    ("hour", -1.2393848425491918),
-                                    ("<time-of-day> sharp|exactly", -5.000584958242754),
-                                    ("minute", -1.7047480922384253)],
-                               n = 139},
+                                     -5.0072963928307415),
+                                    ("time-of-day (latent)", -1.6931103881582155),
+                                    ("hhmm (latent)", -5.0072963928307415),
+                                    ("hh:mm", -2.4046067073863573),
+                                    ("quarter after|past <hour-of-day>", -3.503218996054467),
+                                    ("until <time>", -4.314149212270796),
+                                    ("about|exactly <time-of-day>", -5.0072963928307415),
+                                    ("hour", -1.2460962771371789),
+                                    ("<time-of-day> sharp|exactly", -5.0072963928307415),
+                                    ("minute", -1.7114595268264121)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.4793847841859027, unseen = -4.624972813284271,
+                     ClassData{prior = -1.466337068793427, unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.228826155721369),
-                                    ("from|since|after <time>", -3.228826155721369),
-                                    ("at <time-of-day>", -3.5165082281731497),
-                                    ("time-of-day (latent)", -1.1811333123561132),
-                                    ("hh:mm", -3.5165082281731497),
-                                    ("until <time>", -3.9219733362813143),
-                                    ("hour", -1.0316015783851495), ("minute", -2.6692103677859462)],
-                               n = 41}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
+                                    ("from|since|after <time>", -3.248434627109745),
+                                    ("at <time-of-day>", -3.536116699561526),
+                                    ("time-of-day (latent)", -1.1689930854299093),
+                                    ("hh:mm", -3.536116699561526),
+                                    ("until <time>", -3.9415818076696905),
+                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
+                               n = 42}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2717,12 +2711,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12260232209233239,
+                     ClassData{prior = -0.13534134786976212,
                                unseen = -4.2626798770413155,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+                     ClassData{prior = -2.0668627594729756,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3612,7 +3607,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.116469906068116, unseen = -4.672828834461907,
+                     ClassData{prior = -1.1340142157190256, unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.054001181677967),
@@ -3635,46 +3630,47 @@ classifiers
                                     ("<time-of-day> am|pm<time-of-day> am|pm", -3.054001181677967)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.3966544784260094, unseen = -5.220355825078324,
+                     ClassData{prior = -0.38822330167365837,
+                               unseen = -5.241747015059643,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.116323468940876),
-                                    ("<time> timezonehhhmm", -4.116323468940876),
+                                   [("hhhmm<time> timezone", -4.137829674161839),
+                                    ("<time> timezonehhhmm", -4.137829674161839),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.5217885770490405),
-                                    ("until <time>time-of-day (latent)", -3.2690256085536724),
-                                    ("from|since|after <time>hh:mm", -4.5217885770490405),
-                                    ("hh:mmtime-of-day (latent)", -2.5068855565067754),
-                                    ("hh:mm<time-of-day> am|pm", -3.2690256085536724),
-                                    ("minuteminute", -2.4423470353692043),
+                                     -4.543294782270004),
+                                    ("until <time>time-of-day (latent)", -3.2905318137746358),
+                                    ("from|since|after <time>hh:mm", -4.543294782270004),
+                                    ("hh:mmtime-of-day (latent)", -2.463853240590168),
+                                    ("hh:mm<time-of-day> am|pm", -3.1570004211501135),
+                                    ("minuteminute", -2.463853240590168),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.6054978451748854),
-                                    ("hh:mmhh:mm", -3.828641396489095),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.116323468940876),
-                                    ("hhhmmhhhmm", -4.116323468940876),
-                                    ("hourhour", -2.03688192726104),
+                                     -3.6270040503958487),
+                                    ("hh:mmhh:mm", -3.8501476017100584),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.137829674161839),
+                                    ("hhhmmhhhmm", -4.137829674161839),
+                                    ("hourhour", -2.0583881324820035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.828641396489095),
-                                    ("hourminute", -3.4231762883809305),
-                                    ("minutehour", -1.6885752329928243),
-                                    ("<time> timezonehh:mm", -4.5217885770490405),
-                                    ("hh:mm<time> timezone", -4.5217885770490405),
-                                    ("hhhmmtime-of-day (latent)", -3.828641396489095),
-                                    ("until <time><time-of-day> am|pm", -4.116323468940876),
+                                     -3.8501476017100584),
+                                    ("hourminute", -3.4446824936018943),
+                                    ("minutehour", -1.6529230243738393),
+                                    ("<time> timezonehh:mm", -4.543294782270004),
+                                    ("hh:mm<time> timezone", -4.543294782270004),
+                                    ("hhhmmtime-of-day (latent)", -3.8501476017100584),
+                                    ("until <time><time-of-day> am|pm", -4.137829674161839),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
-                                    ("<time-of-day> am|pmhh:mm", -4.5217885770490405),
+                                     -4.543294782270004),
+                                    ("<time-of-day> am|pmhh:mm", -4.543294782270004),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.828641396489095),
+                                     -3.8501476017100584),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.0177111802727663),
-                                    ("at <time-of-day>time-of-day (latent)", -3.828641396489095),
-                                    ("<time> timezonetime-of-day (latent)", -3.828641396489095),
+                                     -3.0392173854937297),
+                                    ("at <time-of-day>time-of-day (latent)", -3.8501476017100584),
+                                    ("<time> timezonetime-of-day (latent)", -3.8501476017100584),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
+                                     -4.543294782270004),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.828641396489095)],
-                               n = 76}}),
+                                     -3.8501476017100584)],
+                               n = 78}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_CA.hs b/Duckling/Ranking/Classifiers/EN_CA.hs
index 6ba97917..b17f8db5 100644
--- a/Duckling/Ranking/Classifiers/EN_CA.hs
+++ b/Duckling/Ranking/Classifiers/EN_CA.hs
@@ -83,12 +83,12 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5485219463801757,
+                     ClassData{prior = -0.5519485630968232,
                                unseen = -6.2285110035911835,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 505},
                    koData =
-                     ClassData{prior = -0.8622837316150084, unseen = -5.916202062607435,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 369}}),
+                     ClassData{prior = -0.8576131380990365, unseen = -5.924255797414532,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 372}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1896,8 +1896,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2261,8 +2261,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2270,13 +2269,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("Groundhog Day",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2529,19 +2523,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.7048889984366284, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7087724984630261, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.6815416344396374, unseen = -4.890349128221754,
+                     ClassData{prior = -0.6777622617204658, unseen = -4.897839799950911,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15541410387403026),
-                                    ("integer (0..19)", -1.9383629434199303)],
-                               n = 130}}),
+                                   [("integer (numeric)", -0.15415067982725836),
+                                    ("integer (0..19)", -1.9459101490553135)],
+                               n = 131}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2646,41 +2640,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2607262624632527, unseen = -5.71042701737487,
+                     ClassData{prior = -0.26452876747706405,
+                               unseen = -5.717027701406222,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7612001156935624),
-                                    ("integer after|past <hour-of-day>", -4.3208159036289855),
-                                    ("at <time-of-day>", -2.374905754573672),
-                                    ("<time-of-day> o'clock", -4.608497976080766),
-                                    ("half after|past <hour-of-day>", -4.608497976080766),
-                                    ("second", -5.01396308418893), ("hh:mm:ss", -5.01396308418893),
-                                    ("<hour-of-day> <integer>", -4.097672352314775),
+                                   [("from|since|after <time>", -3.767822656454056),
+                                    ("integer after|past <hour-of-day>", -4.327438444389479),
+                                    ("at <time-of-day>", -2.3815282953341654),
+                                    ("<time-of-day> o'clock", -4.61512051684126),
+                                    ("half after|past <hour-of-day>", -4.61512051684126),
+                                    ("second", -4.61512051684126), ("hh:mm:ss", -4.61512051684126),
+                                    ("<hour-of-day> <integer>", -4.104294893075269),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.01396308418893),
-                                    ("time-of-day (latent)", -1.6997770795164049),
-                                    ("hhmm (latent)", -5.01396308418893),
-                                    ("hh:mm", -2.374905754573672),
-                                    ("quarter after|past <hour-of-day>", -3.5098856874126563),
-                                    ("until <time>", -4.3208159036289855),
-                                    ("about|exactly <time-of-day>", -5.01396308418893),
-                                    ("hour", -1.252762968495368),
-                                    ("<time-of-day> sharp|exactly", -5.01396308418893),
-                                    ("minute", -1.6817585740137264)],
-                               n = 141},
+                                     -5.020585624949423),
+                                    ("time-of-day (latent)", -1.7063996202768983),
+                                    ("hhmm (latent)", -5.020585624949423),
+                                    ("hh:mm", -2.3815282953341654),
+                                    ("quarter after|past <hour-of-day>", -3.5165082281731497),
+                                    ("until <time>", -4.327438444389479),
+                                    ("about|exactly <time-of-day>", -5.020585624949423),
+                                    ("hour", -1.2593855092558615),
+                                    ("<time-of-day> sharp|exactly", -5.020585624949423),
+                                    ("minute", -1.68838111477422)],
+                               n = 142},
                    koData =
-                     ClassData{prior = -1.4718165345580525,
-                               unseen = -4.6443908991413725,
+                     ClassData{prior = -1.4591557093847622, unseen = -4.663439094112067,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
-                                    ("from|since|after <time>", -3.248434627109745),
-                                    ("at <time-of-day>", -3.536116699561526),
-                                    ("time-of-day (latent)", -1.1689930854299093),
-                                    ("hh:mm", -3.536116699561526),
-                                    ("until <time>", -3.9415818076696905),
-                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
-                               n = 42}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.2676659890376327),
+                                    ("from|since|after <time>", -3.2676659890376327),
+                                    ("at <time-of-day>", -3.5553480614894135),
+                                    ("time-of-day (latent)", -1.157452788691043),
+                                    ("hh:mm", -3.5553480614894135),
+                                    ("until <time>", -3.960813169597578),
+                                    ("hour", -1.0163741904311376), ("minute", -2.70805020110221)],
+                               n = 43}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2827,13 +2821,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.13353139262452263,
+                     ClassData{prior = -0.14595391262307983,
                                unseen = -4.276666119016055,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 70},
                    koData =
-                     ClassData{prior = -2.0794415416798357,
-                               unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
+                     ClassData{prior = -1.9965538818740682,
+                               unseen = -2.5649493574615367,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 11}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3758,7 +3752,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.1340142157190256, unseen = -4.68213122712422,
+                     ClassData{prior = -1.1512560221535317, unseen = -4.68213122712422,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.0633909220278057),
@@ -3782,48 +3776,47 @@ classifiers
                                      -3.0633909220278057)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.38822330167365837,
-                               unseen = -5.247024072160486,
+                     ClassData{prior = -0.3801473001238745, unseen = -5.267858159063328,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.143134726391533),
-                                    ("<time> timezonehhhmm", -4.143134726391533),
+                                   [("hhhmm<time> timezone", -4.164077900236776),
+                                    ("<time> timezonehhhmm", -4.164077900236776),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.548599834499697),
-                                    ("until <time>time-of-day (latent)", -3.295836866004329),
-                                    ("from|since|after <time>hh:mm", -4.548599834499697),
-                                    ("hh:mmtime-of-day (latent)", -2.5336968139574325),
-                                    ("hh:mm<time-of-day> am|pm", -3.295836866004329),
-                                    ("minuteminute", -2.469158292819861),
+                                     -4.56954300834494),
+                                    ("until <time>time-of-day (latent)", -3.316780039849572),
+                                    ("from|since|after <time>hh:mm", -4.56954300834494),
+                                    ("hh:mmtime-of-day (latent)", -2.4901014666651045),
+                                    ("hh:mm<time-of-day> am|pm", -3.1832486472250494),
+                                    ("minuteminute", -2.4901014666651045),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.632309102625542),
-                                    ("hh:mmhh:mm", -3.855452653939752),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.143134726391533),
-                                    ("hhhmmhhhmm", -4.143134726391533),
-                                    ("at <time-of-day><time-of-day> am|pm", -4.548599834499697),
-                                    ("hourhour", -1.9836504770381604),
+                                     -3.653252276470785),
+                                    ("hh:mmhh:mm", -3.876395827784995),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.164077900236776),
+                                    ("hhhmmhhhmm", -4.164077900236776),
+                                    ("at <time-of-day><time-of-day> am|pm", -4.56954300834494),
+                                    ("hourhour", -2.0045936508834035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.855452653939752),
-                                    ("hourminute", -3.4499875458315876),
-                                    ("minutehour", -1.715386490443481),
-                                    ("<time> timezonehh:mm", -4.548599834499697),
-                                    ("hh:mm<time> timezone", -4.548599834499697),
-                                    ("hhhmmtime-of-day (latent)", -3.855452653939752),
-                                    ("until <time><time-of-day> am|pm", -4.143134726391533),
+                                     -3.876395827784995),
+                                    ("hourminute", -3.4709307196768306),
+                                    ("minutehour", -1.6791712504487755),
+                                    ("<time> timezonehh:mm", -4.56954300834494),
+                                    ("hh:mm<time> timezone", -4.56954300834494),
+                                    ("hhhmmtime-of-day (latent)", -3.876395827784995),
+                                    ("until <time><time-of-day> am|pm", -4.164077900236776),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.548599834499697),
-                                    ("<time-of-day> am|pmhh:mm", -4.548599834499697),
+                                     -4.56954300834494),
+                                    ("<time-of-day> am|pmhh:mm", -4.56954300834494),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.855452653939752),
+                                     -3.876395827784995),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.044522437723423),
-                                    ("at <time-of-day>time-of-day (latent)", -3.632309102625542),
-                                    ("<time> timezonetime-of-day (latent)", -3.855452653939752),
+                                     -3.065465611568666),
+                                    ("at <time-of-day>time-of-day (latent)", -3.653252276470785),
+                                    ("<time> timezonetime-of-day (latent)", -3.876395827784995),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.548599834499697),
+                                     -4.56954300834494),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.855452653939752)],
-                               n = 78}}),
+                                     -3.876395827784995)],
+                               n = 80}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_GB.hs b/Duckling/Ranking/Classifiers/EN_GB.hs
index c2b15452..9d6846e5 100644
--- a/Duckling/Ranking/Classifiers/EN_GB.hs
+++ b/Duckling/Ranking/Classifiers/EN_GB.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5627853626967017, unseen = -6.208590026096629,
+                     ClassData{prior = -0.5662316613402895, unseen = -6.208590026096629,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 495},
                    koData =
-                     ClassData{prior = -0.84308732785086, unseen = -5.929589143389895,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 374}}),
+                     ClassData{prior = -0.8385442364609689, unseen = -5.937536205082426,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 377}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1880,8 +1880,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2222,8 +2222,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2231,13 +2230,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.4166384087062897, unseen = -5.25227342804663,
@@ -2475,19 +2469,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.7087724984630261, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7126409752409464, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.6777622617204658, unseen = -4.897839799950911,
+                     ClassData{prior = -0.6740261391131669, unseen = -4.90527477843843,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15415067982725836),
-                                    ("integer (0..19)", -1.9459101490553135)],
-                               n = 131}}),
+                                   [("integer (numeric)", -0.15290767158766128),
+                                    ("integer (0..19)", -1.9534008207844709)],
+                               n = 132}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2592,41 +2586,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2607262624632527, unseen = -5.71042701737487,
+                     ClassData{prior = -0.26452876747706405,
+                               unseen = -5.717027701406222,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7612001156935624),
-                                    ("integer after|past <hour-of-day>", -4.3208159036289855),
-                                    ("at <time-of-day>", -2.374905754573672),
-                                    ("<time-of-day> o'clock", -4.608497976080766),
-                                    ("half after|past <hour-of-day>", -4.608497976080766),
-                                    ("second", -5.01396308418893), ("hh:mm:ss", -5.01396308418893),
-                                    ("<hour-of-day> <integer>", -4.097672352314775),
+                                   [("from|since|after <time>", -3.767822656454056),
+                                    ("integer after|past <hour-of-day>", -4.327438444389479),
+                                    ("at <time-of-day>", -2.3815282953341654),
+                                    ("<time-of-day> o'clock", -4.61512051684126),
+                                    ("half after|past <hour-of-day>", -4.61512051684126),
+                                    ("second", -4.61512051684126), ("hh:mm:ss", -4.61512051684126),
+                                    ("<hour-of-day> <integer>", -4.104294893075269),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.01396308418893),
-                                    ("time-of-day (latent)", -1.6997770795164049),
-                                    ("hhmm (latent)", -5.01396308418893),
-                                    ("hh:mm", -2.374905754573672),
-                                    ("quarter after|past <hour-of-day>", -3.5098856874126563),
-                                    ("until <time>", -4.3208159036289855),
-                                    ("about|exactly <time-of-day>", -5.01396308418893),
-                                    ("hour", -1.252762968495368),
-                                    ("<time-of-day> sharp|exactly", -5.01396308418893),
-                                    ("minute", -1.6817585740137264)],
-                               n = 141},
+                                     -5.020585624949423),
+                                    ("time-of-day (latent)", -1.7063996202768983),
+                                    ("hhmm (latent)", -5.020585624949423),
+                                    ("hh:mm", -2.3815282953341654),
+                                    ("quarter after|past <hour-of-day>", -3.5165082281731497),
+                                    ("until <time>", -4.327438444389479),
+                                    ("about|exactly <time-of-day>", -5.020585624949423),
+                                    ("hour", -1.2593855092558615),
+                                    ("<time-of-day> sharp|exactly", -5.020585624949423),
+                                    ("minute", -1.68838111477422)],
+                               n = 142},
                    koData =
-                     ClassData{prior = -1.4718165345580525,
-                               unseen = -4.6443908991413725,
+                     ClassData{prior = -1.4591557093847622, unseen = -4.663439094112067,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
-                                    ("from|since|after <time>", -3.248434627109745),
-                                    ("at <time-of-day>", -3.536116699561526),
-                                    ("time-of-day (latent)", -1.1689930854299093),
-                                    ("hh:mm", -3.536116699561526),
-                                    ("until <time>", -3.9415818076696905),
-                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
-                               n = 42}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.2676659890376327),
+                                    ("from|since|after <time>", -3.2676659890376327),
+                                    ("at <time-of-day>", -3.5553480614894135),
+                                    ("time-of-day (latent)", -1.157452788691043),
+                                    ("hh:mm", -3.5553480614894135),
+                                    ("until <time>", -3.960813169597578),
+                                    ("hour", -1.0163741904311376), ("minute", -2.70805020110221)],
+                               n = 43}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2773,12 +2767,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12095261041766256,
+                     ClassData{prior = -0.13353139262452263,
                                unseen = -4.276666119016055,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 70},
                    koData =
-                     ClassData{prior = -2.172223275130802, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+                     ClassData{prior = -2.0794415416798357,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3684,7 +3679,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.1340142157190256, unseen = -4.68213122712422,
+                     ClassData{prior = -1.1512560221535317, unseen = -4.68213122712422,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.0633909220278057),
@@ -3708,48 +3703,47 @@ classifiers
                                      -3.0633909220278057)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.38822330167365837,
-                               unseen = -5.247024072160486,
+                     ClassData{prior = -0.3801473001238745, unseen = -5.267858159063328,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.143134726391533),
-                                    ("<time> timezonehhhmm", -4.143134726391533),
+                                   [("hhhmm<time> timezone", -4.164077900236776),
+                                    ("<time> timezonehhhmm", -4.164077900236776),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.548599834499697),
-                                    ("until <time>time-of-day (latent)", -3.295836866004329),
-                                    ("from|since|after <time>hh:mm", -4.548599834499697),
-                                    ("hh:mmtime-of-day (latent)", -2.5336968139574325),
-                                    ("hh:mm<time-of-day> am|pm", -3.295836866004329),
-                                    ("minuteminute", -2.469158292819861),
+                                     -4.56954300834494),
+                                    ("until <time>time-of-day (latent)", -3.316780039849572),
+                                    ("from|since|after <time>hh:mm", -4.56954300834494),
+                                    ("hh:mmtime-of-day (latent)", -2.4901014666651045),
+                                    ("hh:mm<time-of-day> am|pm", -3.1832486472250494),
+                                    ("minuteminute", -2.4901014666651045),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.632309102625542),
-                                    ("hh:mmhh:mm", -3.855452653939752),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.143134726391533),
-                                    ("hhhmmhhhmm", -4.143134726391533),
-                                    ("at <time-of-day><time-of-day> am|pm", -4.548599834499697),
-                                    ("hourhour", -1.9836504770381604),
+                                     -3.653252276470785),
+                                    ("hh:mmhh:mm", -3.876395827784995),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.164077900236776),
+                                    ("hhhmmhhhmm", -4.164077900236776),
+                                    ("at <time-of-day><time-of-day> am|pm", -4.56954300834494),
+                                    ("hourhour", -2.0045936508834035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.855452653939752),
-                                    ("hourminute", -3.4499875458315876),
-                                    ("minutehour", -1.715386490443481),
-                                    ("<time> timezonehh:mm", -4.548599834499697),
-                                    ("hh:mm<time> timezone", -4.548599834499697),
-                                    ("hhhmmtime-of-day (latent)", -3.855452653939752),
-                                    ("until <time><time-of-day> am|pm", -4.143134726391533),
+                                     -3.876395827784995),
+                                    ("hourminute", -3.4709307196768306),
+                                    ("minutehour", -1.6791712504487755),
+                                    ("<time> timezonehh:mm", -4.56954300834494),
+                                    ("hh:mm<time> timezone", -4.56954300834494),
+                                    ("hhhmmtime-of-day (latent)", -3.876395827784995),
+                                    ("until <time><time-of-day> am|pm", -4.164077900236776),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.548599834499697),
-                                    ("<time-of-day> am|pmhh:mm", -4.548599834499697),
+                                     -4.56954300834494),
+                                    ("<time-of-day> am|pmhh:mm", -4.56954300834494),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.855452653939752),
+                                     -3.876395827784995),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.044522437723423),
-                                    ("at <time-of-day>time-of-day (latent)", -3.632309102625542),
-                                    ("<time> timezonetime-of-day (latent)", -3.855452653939752),
+                                     -3.065465611568666),
+                                    ("at <time-of-day>time-of-day (latent)", -3.653252276470785),
+                                    ("<time> timezonetime-of-day (latent)", -3.876395827784995),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.548599834499697),
+                                     -4.56954300834494),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.855452653939752)],
-                               n = 78}}),
+                                     -3.876395827784995)],
+                               n = 80}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_IE.hs b/Duckling/Ranking/Classifiers/EN_IE.hs
index 0e630135..22810d15 100644
--- a/Duckling/Ranking/Classifiers/EN_IE.hs
+++ b/Duckling/Ranking/Classifiers/EN_IE.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.53208562319284, unseen = -6.186208623900494,
+                     ClassData{prior = -0.5357197883070597, unseen = -6.186208623900494,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 484},
                    koData =
-                     ClassData{prior = -0.8852249122992647, unseen = -5.834810737062605,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 340}}),
+                     ClassData{prior = -0.8800742478577515, unseen = -5.84354441703136,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 343}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1845,8 +1845,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2187,8 +2187,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2196,13 +2195,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.42050298547270487,
@@ -2434,19 +2428,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6970764586998348, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7009903580209712, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.689233281238809, unseen = -4.875197323201151,
+                     ClassData{prior = -0.6853650401178903, unseen = -4.882801922586371,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15800424914324832),
-                                    ("integer (0..19)", -1.923095471289142)],
-                               n = 128}}),
+                                   [("integer (numeric)", -0.15669845190605702),
+                                    ("integer (0..19)", -1.9307583440347111)],
+                               n = 129}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2551,41 +2545,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2584829177595186, unseen = -5.697093486505405,
+                     ClassData{prior = -0.262364264467491, unseen = -5.703782474656201,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7478219897473863),
-                                    ("integer after|past <hour-of-day>", -4.307437777682809),
-                                    ("at <time-of-day>", -2.3978952727983707),
-                                    ("<time-of-day> o'clock", -4.59511985013459),
-                                    ("half after|past <hour-of-day>", -4.59511985013459),
-                                    ("second", -5.000584958242754),
-                                    ("hh:mm:ss", -5.000584958242754),
-                                    ("<hour-of-day> <integer>", -4.084294226368599),
+                                   [("from|since|after <time>", -3.7545334243353734),
+                                    ("integer after|past <hour-of-day>", -4.314149212270796),
+                                    ("at <time-of-day>", -2.4046067073863573),
+                                    ("<time-of-day> o'clock", -4.601831284722577),
+                                    ("half after|past <hour-of-day>", -4.601831284722577),
+                                    ("second", -4.601831284722577),
+                                    ("hh:mm:ss", -4.601831284722577),
+                                    ("<hour-of-day> <integer>", -4.091005660956586),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.000584958242754),
-                                    ("time-of-day (latent)", -1.6863989535702288),
-                                    ("hhmm (latent)", -5.000584958242754),
-                                    ("hh:mm", -2.3978952727983707),
-                                    ("quarter after|past <hour-of-day>", -3.4965075614664802),
-                                    ("until <time>", -4.307437777682809),
-                                    ("about|exactly <time-of-day>", -5.000584958242754),
-                                    ("hour", -1.2393848425491918),
-                                    ("<time-of-day> sharp|exactly", -5.000584958242754),
-                                    ("minute", -1.7047480922384253)],
-                               n = 139},
+                                     -5.0072963928307415),
+                                    ("time-of-day (latent)", -1.6931103881582155),
+                                    ("hhmm (latent)", -5.0072963928307415),
+                                    ("hh:mm", -2.4046067073863573),
+                                    ("quarter after|past <hour-of-day>", -3.503218996054467),
+                                    ("until <time>", -4.314149212270796),
+                                    ("about|exactly <time-of-day>", -5.0072963928307415),
+                                    ("hour", -1.2460962771371789),
+                                    ("<time-of-day> sharp|exactly", -5.0072963928307415),
+                                    ("minute", -1.7114595268264121)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.4793847841859027, unseen = -4.624972813284271,
+                     ClassData{prior = -1.466337068793427, unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.228826155721369),
-                                    ("from|since|after <time>", -3.228826155721369),
-                                    ("at <time-of-day>", -3.5165082281731497),
-                                    ("time-of-day (latent)", -1.1811333123561132),
-                                    ("hh:mm", -3.5165082281731497),
-                                    ("until <time>", -3.9219733362813143),
-                                    ("hour", -1.0316015783851495), ("minute", -2.6692103677859462)],
-                               n = 41}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
+                                    ("from|since|after <time>", -3.248434627109745),
+                                    ("at <time-of-day>", -3.536116699561526),
+                                    ("time-of-day (latent)", -1.1689930854299093),
+                                    ("hh:mm", -3.536116699561526),
+                                    ("until <time>", -3.9415818076696905),
+                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
+                               n = 42}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2717,12 +2711,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12260232209233239,
+                     ClassData{prior = -0.13534134786976212,
                                unseen = -4.2626798770413155,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+                     ClassData{prior = -2.0668627594729756,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3612,7 +3607,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.116469906068116, unseen = -4.672828834461907,
+                     ClassData{prior = -1.1340142157190256, unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.054001181677967),
@@ -3635,46 +3630,47 @@ classifiers
                                     ("<time-of-day> am|pm<time-of-day> am|pm", -3.054001181677967)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.3966544784260094, unseen = -5.220355825078324,
+                     ClassData{prior = -0.38822330167365837,
+                               unseen = -5.241747015059643,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.116323468940876),
-                                    ("<time> timezonehhhmm", -4.116323468940876),
+                                   [("hhhmm<time> timezone", -4.137829674161839),
+                                    ("<time> timezonehhhmm", -4.137829674161839),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.5217885770490405),
-                                    ("until <time>time-of-day (latent)", -3.2690256085536724),
-                                    ("from|since|after <time>hh:mm", -4.5217885770490405),
-                                    ("hh:mmtime-of-day (latent)", -2.5068855565067754),
-                                    ("hh:mm<time-of-day> am|pm", -3.2690256085536724),
-                                    ("minuteminute", -2.4423470353692043),
+                                     -4.543294782270004),
+                                    ("until <time>time-of-day (latent)", -3.2905318137746358),
+                                    ("from|since|after <time>hh:mm", -4.543294782270004),
+                                    ("hh:mmtime-of-day (latent)", -2.463853240590168),
+                                    ("hh:mm<time-of-day> am|pm", -3.1570004211501135),
+                                    ("minuteminute", -2.463853240590168),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.6054978451748854),
-                                    ("hh:mmhh:mm", -3.828641396489095),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.116323468940876),
-                                    ("hhhmmhhhmm", -4.116323468940876),
-                                    ("hourhour", -2.03688192726104),
+                                     -3.6270040503958487),
+                                    ("hh:mmhh:mm", -3.8501476017100584),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.137829674161839),
+                                    ("hhhmmhhhmm", -4.137829674161839),
+                                    ("hourhour", -2.0583881324820035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.828641396489095),
-                                    ("hourminute", -3.4231762883809305),
-                                    ("minutehour", -1.6885752329928243),
-                                    ("<time> timezonehh:mm", -4.5217885770490405),
-                                    ("hh:mm<time> timezone", -4.5217885770490405),
-                                    ("hhhmmtime-of-day (latent)", -3.828641396489095),
-                                    ("until <time><time-of-day> am|pm", -4.116323468940876),
+                                     -3.8501476017100584),
+                                    ("hourminute", -3.4446824936018943),
+                                    ("minutehour", -1.6529230243738393),
+                                    ("<time> timezonehh:mm", -4.543294782270004),
+                                    ("hh:mm<time> timezone", -4.543294782270004),
+                                    ("hhhmmtime-of-day (latent)", -3.8501476017100584),
+                                    ("until <time><time-of-day> am|pm", -4.137829674161839),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
-                                    ("<time-of-day> am|pmhh:mm", -4.5217885770490405),
+                                     -4.543294782270004),
+                                    ("<time-of-day> am|pmhh:mm", -4.543294782270004),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.828641396489095),
+                                     -3.8501476017100584),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.0177111802727663),
-                                    ("at <time-of-day>time-of-day (latent)", -3.828641396489095),
-                                    ("<time> timezonetime-of-day (latent)", -3.828641396489095),
+                                     -3.0392173854937297),
+                                    ("at <time-of-day>time-of-day (latent)", -3.8501476017100584),
+                                    ("<time> timezonetime-of-day (latent)", -3.8501476017100584),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
+                                     -4.543294782270004),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.828641396489095)],
-                               n = 76}}),
+                                     -3.8501476017100584)],
+                               n = 78}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_IN.hs b/Duckling/Ranking/Classifiers/EN_IN.hs
index 5e6fd61b..2c5c92fe 100644
--- a/Duckling/Ranking/Classifiers/EN_IN.hs
+++ b/Duckling/Ranking/Classifiers/EN_IN.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.53208562319284, unseen = -6.186208623900494,
+                     ClassData{prior = -0.5357197883070597, unseen = -6.186208623900494,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 484},
                    koData =
-                     ClassData{prior = -0.8852249122992647, unseen = -5.834810737062605,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 340}}),
+                     ClassData{prior = -0.8800742478577515, unseen = -5.84354441703136,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 343}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1845,8 +1845,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2187,8 +2187,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2196,13 +2195,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.42050298547270487,
@@ -2434,19 +2428,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6970764586998348, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7009903580209712, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.689233281238809, unseen = -4.875197323201151,
+                     ClassData{prior = -0.6853650401178903, unseen = -4.882801922586371,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15800424914324832),
-                                    ("integer (0..19)", -1.923095471289142)],
-                               n = 128}}),
+                                   [("integer (numeric)", -0.15669845190605702),
+                                    ("integer (0..19)", -1.9307583440347111)],
+                               n = 129}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2551,41 +2545,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2584829177595186, unseen = -5.697093486505405,
+                     ClassData{prior = -0.262364264467491, unseen = -5.703782474656201,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7478219897473863),
-                                    ("integer after|past <hour-of-day>", -4.307437777682809),
-                                    ("at <time-of-day>", -2.3978952727983707),
-                                    ("<time-of-day> o'clock", -4.59511985013459),
-                                    ("half after|past <hour-of-day>", -4.59511985013459),
-                                    ("second", -5.000584958242754),
-                                    ("hh:mm:ss", -5.000584958242754),
-                                    ("<hour-of-day> <integer>", -4.084294226368599),
+                                   [("from|since|after <time>", -3.7545334243353734),
+                                    ("integer after|past <hour-of-day>", -4.314149212270796),
+                                    ("at <time-of-day>", -2.4046067073863573),
+                                    ("<time-of-day> o'clock", -4.601831284722577),
+                                    ("half after|past <hour-of-day>", -4.601831284722577),
+                                    ("second", -4.601831284722577),
+                                    ("hh:mm:ss", -4.601831284722577),
+                                    ("<hour-of-day> <integer>", -4.091005660956586),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.000584958242754),
-                                    ("time-of-day (latent)", -1.6863989535702288),
-                                    ("hhmm (latent)", -5.000584958242754),
-                                    ("hh:mm", -2.3978952727983707),
-                                    ("quarter after|past <hour-of-day>", -3.4965075614664802),
-                                    ("until <time>", -4.307437777682809),
-                                    ("about|exactly <time-of-day>", -5.000584958242754),
-                                    ("hour", -1.2393848425491918),
-                                    ("<time-of-day> sharp|exactly", -5.000584958242754),
-                                    ("minute", -1.7047480922384253)],
-                               n = 139},
+                                     -5.0072963928307415),
+                                    ("time-of-day (latent)", -1.6931103881582155),
+                                    ("hhmm (latent)", -5.0072963928307415),
+                                    ("hh:mm", -2.4046067073863573),
+                                    ("quarter after|past <hour-of-day>", -3.503218996054467),
+                                    ("until <time>", -4.314149212270796),
+                                    ("about|exactly <time-of-day>", -5.0072963928307415),
+                                    ("hour", -1.2460962771371789),
+                                    ("<time-of-day> sharp|exactly", -5.0072963928307415),
+                                    ("minute", -1.7114595268264121)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.4793847841859027, unseen = -4.624972813284271,
+                     ClassData{prior = -1.466337068793427, unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.228826155721369),
-                                    ("from|since|after <time>", -3.228826155721369),
-                                    ("at <time-of-day>", -3.5165082281731497),
-                                    ("time-of-day (latent)", -1.1811333123561132),
-                                    ("hh:mm", -3.5165082281731497),
-                                    ("until <time>", -3.9219733362813143),
-                                    ("hour", -1.0316015783851495), ("minute", -2.6692103677859462)],
-                               n = 41}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
+                                    ("from|since|after <time>", -3.248434627109745),
+                                    ("at <time-of-day>", -3.536116699561526),
+                                    ("time-of-day (latent)", -1.1689930854299093),
+                                    ("hh:mm", -3.536116699561526),
+                                    ("until <time>", -3.9415818076696905),
+                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
+                               n = 42}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2717,12 +2711,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12260232209233239,
+                     ClassData{prior = -0.13534134786976212,
                                unseen = -4.2626798770413155,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+                     ClassData{prior = -2.0668627594729756,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3612,7 +3607,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.116469906068116, unseen = -4.672828834461907,
+                     ClassData{prior = -1.1340142157190256, unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.054001181677967),
@@ -3635,46 +3630,47 @@ classifiers
                                     ("<time-of-day> am|pm<time-of-day> am|pm", -3.054001181677967)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.3966544784260094, unseen = -5.220355825078324,
+                     ClassData{prior = -0.38822330167365837,
+                               unseen = -5.241747015059643,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.116323468940876),
-                                    ("<time> timezonehhhmm", -4.116323468940876),
+                                   [("hhhmm<time> timezone", -4.137829674161839),
+                                    ("<time> timezonehhhmm", -4.137829674161839),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.5217885770490405),
-                                    ("until <time>time-of-day (latent)", -3.2690256085536724),
-                                    ("from|since|after <time>hh:mm", -4.5217885770490405),
-                                    ("hh:mmtime-of-day (latent)", -2.5068855565067754),
-                                    ("hh:mm<time-of-day> am|pm", -3.2690256085536724),
-                                    ("minuteminute", -2.4423470353692043),
+                                     -4.543294782270004),
+                                    ("until <time>time-of-day (latent)", -3.2905318137746358),
+                                    ("from|since|after <time>hh:mm", -4.543294782270004),
+                                    ("hh:mmtime-of-day (latent)", -2.463853240590168),
+                                    ("hh:mm<time-of-day> am|pm", -3.1570004211501135),
+                                    ("minuteminute", -2.463853240590168),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.6054978451748854),
-                                    ("hh:mmhh:mm", -3.828641396489095),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.116323468940876),
-                                    ("hhhmmhhhmm", -4.116323468940876),
-                                    ("hourhour", -2.03688192726104),
+                                     -3.6270040503958487),
+                                    ("hh:mmhh:mm", -3.8501476017100584),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.137829674161839),
+                                    ("hhhmmhhhmm", -4.137829674161839),
+                                    ("hourhour", -2.0583881324820035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.828641396489095),
-                                    ("hourminute", -3.4231762883809305),
-                                    ("minutehour", -1.6885752329928243),
-                                    ("<time> timezonehh:mm", -4.5217885770490405),
-                                    ("hh:mm<time> timezone", -4.5217885770490405),
-                                    ("hhhmmtime-of-day (latent)", -3.828641396489095),
-                                    ("until <time><time-of-day> am|pm", -4.116323468940876),
+                                     -3.8501476017100584),
+                                    ("hourminute", -3.4446824936018943),
+                                    ("minutehour", -1.6529230243738393),
+                                    ("<time> timezonehh:mm", -4.543294782270004),
+                                    ("hh:mm<time> timezone", -4.543294782270004),
+                                    ("hhhmmtime-of-day (latent)", -3.8501476017100584),
+                                    ("until <time><time-of-day> am|pm", -4.137829674161839),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
-                                    ("<time-of-day> am|pmhh:mm", -4.5217885770490405),
+                                     -4.543294782270004),
+                                    ("<time-of-day> am|pmhh:mm", -4.543294782270004),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.828641396489095),
+                                     -3.8501476017100584),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.0177111802727663),
-                                    ("at <time-of-day>time-of-day (latent)", -3.828641396489095),
-                                    ("<time> timezonetime-of-day (latent)", -3.828641396489095),
+                                     -3.0392173854937297),
+                                    ("at <time-of-day>time-of-day (latent)", -3.8501476017100584),
+                                    ("<time> timezonetime-of-day (latent)", -3.8501476017100584),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
+                                     -4.543294782270004),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.828641396489095)],
-                               n = 76}}),
+                                     -3.8501476017100584)],
+                               n = 78}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_JM.hs b/Duckling/Ranking/Classifiers/EN_JM.hs
index 64440b25..ef2943f9 100644
--- a/Duckling/Ranking/Classifiers/EN_JM.hs
+++ b/Duckling/Ranking/Classifiers/EN_JM.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.53208562319284, unseen = -6.186208623900494,
+                     ClassData{prior = -0.5357197883070597, unseen = -6.186208623900494,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 484},
                    koData =
-                     ClassData{prior = -0.8852249122992647, unseen = -5.834810737062605,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 340}}),
+                     ClassData{prior = -0.8800742478577515, unseen = -5.84354441703136,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 343}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1845,8 +1845,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2187,8 +2187,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2196,13 +2195,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.42050298547270487,
@@ -2434,19 +2428,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6970764586998348, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7009903580209712, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.689233281238809, unseen = -4.875197323201151,
+                     ClassData{prior = -0.6853650401178903, unseen = -4.882801922586371,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15800424914324832),
-                                    ("integer (0..19)", -1.923095471289142)],
-                               n = 128}}),
+                                   [("integer (numeric)", -0.15669845190605702),
+                                    ("integer (0..19)", -1.9307583440347111)],
+                               n = 129}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2551,41 +2545,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2584829177595186, unseen = -5.697093486505405,
+                     ClassData{prior = -0.262364264467491, unseen = -5.703782474656201,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7478219897473863),
-                                    ("integer after|past <hour-of-day>", -4.307437777682809),
-                                    ("at <time-of-day>", -2.3978952727983707),
-                                    ("<time-of-day> o'clock", -4.59511985013459),
-                                    ("half after|past <hour-of-day>", -4.59511985013459),
-                                    ("second", -5.000584958242754),
-                                    ("hh:mm:ss", -5.000584958242754),
-                                    ("<hour-of-day> <integer>", -4.084294226368599),
+                                   [("from|since|after <time>", -3.7545334243353734),
+                                    ("integer after|past <hour-of-day>", -4.314149212270796),
+                                    ("at <time-of-day>", -2.4046067073863573),
+                                    ("<time-of-day> o'clock", -4.601831284722577),
+                                    ("half after|past <hour-of-day>", -4.601831284722577),
+                                    ("second", -4.601831284722577),
+                                    ("hh:mm:ss", -4.601831284722577),
+                                    ("<hour-of-day> <integer>", -4.091005660956586),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.000584958242754),
-                                    ("time-of-day (latent)", -1.6863989535702288),
-                                    ("hhmm (latent)", -5.000584958242754),
-                                    ("hh:mm", -2.3978952727983707),
-                                    ("quarter after|past <hour-of-day>", -3.4965075614664802),
-                                    ("until <time>", -4.307437777682809),
-                                    ("about|exactly <time-of-day>", -5.000584958242754),
-                                    ("hour", -1.2393848425491918),
-                                    ("<time-of-day> sharp|exactly", -5.000584958242754),
-                                    ("minute", -1.7047480922384253)],
-                               n = 139},
+                                     -5.0072963928307415),
+                                    ("time-of-day (latent)", -1.6931103881582155),
+                                    ("hhmm (latent)", -5.0072963928307415),
+                                    ("hh:mm", -2.4046067073863573),
+                                    ("quarter after|past <hour-of-day>", -3.503218996054467),
+                                    ("until <time>", -4.314149212270796),
+                                    ("about|exactly <time-of-day>", -5.0072963928307415),
+                                    ("hour", -1.2460962771371789),
+                                    ("<time-of-day> sharp|exactly", -5.0072963928307415),
+                                    ("minute", -1.7114595268264121)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.4793847841859027, unseen = -4.624972813284271,
+                     ClassData{prior = -1.466337068793427, unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.228826155721369),
-                                    ("from|since|after <time>", -3.228826155721369),
-                                    ("at <time-of-day>", -3.5165082281731497),
-                                    ("time-of-day (latent)", -1.1811333123561132),
-                                    ("hh:mm", -3.5165082281731497),
-                                    ("until <time>", -3.9219733362813143),
-                                    ("hour", -1.0316015783851495), ("minute", -2.6692103677859462)],
-                               n = 41}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
+                                    ("from|since|after <time>", -3.248434627109745),
+                                    ("at <time-of-day>", -3.536116699561526),
+                                    ("time-of-day (latent)", -1.1689930854299093),
+                                    ("hh:mm", -3.536116699561526),
+                                    ("until <time>", -3.9415818076696905),
+                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
+                               n = 42}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2717,12 +2711,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12260232209233239,
+                     ClassData{prior = -0.13534134786976212,
                                unseen = -4.2626798770413155,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+                     ClassData{prior = -2.0668627594729756,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3612,7 +3607,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.116469906068116, unseen = -4.672828834461907,
+                     ClassData{prior = -1.1340142157190256, unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.054001181677967),
@@ -3635,46 +3630,47 @@ classifiers
                                     ("<time-of-day> am|pm<time-of-day> am|pm", -3.054001181677967)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.3966544784260094, unseen = -5.220355825078324,
+                     ClassData{prior = -0.38822330167365837,
+                               unseen = -5.241747015059643,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.116323468940876),
-                                    ("<time> timezonehhhmm", -4.116323468940876),
+                                   [("hhhmm<time> timezone", -4.137829674161839),
+                                    ("<time> timezonehhhmm", -4.137829674161839),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.5217885770490405),
-                                    ("until <time>time-of-day (latent)", -3.2690256085536724),
-                                    ("from|since|after <time>hh:mm", -4.5217885770490405),
-                                    ("hh:mmtime-of-day (latent)", -2.5068855565067754),
-                                    ("hh:mm<time-of-day> am|pm", -3.2690256085536724),
-                                    ("minuteminute", -2.4423470353692043),
+                                     -4.543294782270004),
+                                    ("until <time>time-of-day (latent)", -3.2905318137746358),
+                                    ("from|since|after <time>hh:mm", -4.543294782270004),
+                                    ("hh:mmtime-of-day (latent)", -2.463853240590168),
+                                    ("hh:mm<time-of-day> am|pm", -3.1570004211501135),
+                                    ("minuteminute", -2.463853240590168),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.6054978451748854),
-                                    ("hh:mmhh:mm", -3.828641396489095),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.116323468940876),
-                                    ("hhhmmhhhmm", -4.116323468940876),
-                                    ("hourhour", -2.03688192726104),
+                                     -3.6270040503958487),
+                                    ("hh:mmhh:mm", -3.8501476017100584),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.137829674161839),
+                                    ("hhhmmhhhmm", -4.137829674161839),
+                                    ("hourhour", -2.0583881324820035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.828641396489095),
-                                    ("hourminute", -3.4231762883809305),
-                                    ("minutehour", -1.6885752329928243),
-                                    ("<time> timezonehh:mm", -4.5217885770490405),
-                                    ("hh:mm<time> timezone", -4.5217885770490405),
-                                    ("hhhmmtime-of-day (latent)", -3.828641396489095),
-                                    ("until <time><time-of-day> am|pm", -4.116323468940876),
+                                     -3.8501476017100584),
+                                    ("hourminute", -3.4446824936018943),
+                                    ("minutehour", -1.6529230243738393),
+                                    ("<time> timezonehh:mm", -4.543294782270004),
+                                    ("hh:mm<time> timezone", -4.543294782270004),
+                                    ("hhhmmtime-of-day (latent)", -3.8501476017100584),
+                                    ("until <time><time-of-day> am|pm", -4.137829674161839),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
-                                    ("<time-of-day> am|pmhh:mm", -4.5217885770490405),
+                                     -4.543294782270004),
+                                    ("<time-of-day> am|pmhh:mm", -4.543294782270004),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.828641396489095),
+                                     -3.8501476017100584),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.0177111802727663),
-                                    ("at <time-of-day>time-of-day (latent)", -3.828641396489095),
-                                    ("<time> timezonetime-of-day (latent)", -3.828641396489095),
+                                     -3.0392173854937297),
+                                    ("at <time-of-day>time-of-day (latent)", -3.8501476017100584),
+                                    ("<time> timezonetime-of-day (latent)", -3.8501476017100584),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
+                                     -4.543294782270004),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.828641396489095)],
-                               n = 76}}),
+                                     -3.8501476017100584)],
+                               n = 78}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_NZ.hs b/Duckling/Ranking/Classifiers/EN_NZ.hs
index 97bca8ed..1670e48b 100644
--- a/Duckling/Ranking/Classifiers/EN_NZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_NZ.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.53208562319284, unseen = -6.186208623900494,
+                     ClassData{prior = -0.5357197883070597, unseen = -6.186208623900494,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 484},
                    koData =
-                     ClassData{prior = -0.8852249122992647, unseen = -5.834810737062605,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 340}}),
+                     ClassData{prior = -0.8800742478577515, unseen = -5.84354441703136,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 343}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1845,8 +1845,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2187,8 +2187,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2196,13 +2195,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.42050298547270487,
@@ -2434,19 +2428,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6970764586998348, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7009903580209712, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.689233281238809, unseen = -4.875197323201151,
+                     ClassData{prior = -0.6853650401178903, unseen = -4.882801922586371,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15800424914324832),
-                                    ("integer (0..19)", -1.923095471289142)],
-                               n = 128}}),
+                                   [("integer (numeric)", -0.15669845190605702),
+                                    ("integer (0..19)", -1.9307583440347111)],
+                               n = 129}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2551,41 +2545,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2584829177595186, unseen = -5.697093486505405,
+                     ClassData{prior = -0.262364264467491, unseen = -5.703782474656201,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7478219897473863),
-                                    ("integer after|past <hour-of-day>", -4.307437777682809),
-                                    ("at <time-of-day>", -2.3978952727983707),
-                                    ("<time-of-day> o'clock", -4.59511985013459),
-                                    ("half after|past <hour-of-day>", -4.59511985013459),
-                                    ("second", -5.000584958242754),
-                                    ("hh:mm:ss", -5.000584958242754),
-                                    ("<hour-of-day> <integer>", -4.084294226368599),
+                                   [("from|since|after <time>", -3.7545334243353734),
+                                    ("integer after|past <hour-of-day>", -4.314149212270796),
+                                    ("at <time-of-day>", -2.4046067073863573),
+                                    ("<time-of-day> o'clock", -4.601831284722577),
+                                    ("half after|past <hour-of-day>", -4.601831284722577),
+                                    ("second", -4.601831284722577),
+                                    ("hh:mm:ss", -4.601831284722577),
+                                    ("<hour-of-day> <integer>", -4.091005660956586),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.000584958242754),
-                                    ("time-of-day (latent)", -1.6863989535702288),
-                                    ("hhmm (latent)", -5.000584958242754),
-                                    ("hh:mm", -2.3978952727983707),
-                                    ("quarter after|past <hour-of-day>", -3.4965075614664802),
-                                    ("until <time>", -4.307437777682809),
-                                    ("about|exactly <time-of-day>", -5.000584958242754),
-                                    ("hour", -1.2393848425491918),
-                                    ("<time-of-day> sharp|exactly", -5.000584958242754),
-                                    ("minute", -1.7047480922384253)],
-                               n = 139},
+                                     -5.0072963928307415),
+                                    ("time-of-day (latent)", -1.6931103881582155),
+                                    ("hhmm (latent)", -5.0072963928307415),
+                                    ("hh:mm", -2.4046067073863573),
+                                    ("quarter after|past <hour-of-day>", -3.503218996054467),
+                                    ("until <time>", -4.314149212270796),
+                                    ("about|exactly <time-of-day>", -5.0072963928307415),
+                                    ("hour", -1.2460962771371789),
+                                    ("<time-of-day> sharp|exactly", -5.0072963928307415),
+                                    ("minute", -1.7114595268264121)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.4793847841859027, unseen = -4.624972813284271,
+                     ClassData{prior = -1.466337068793427, unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.228826155721369),
-                                    ("from|since|after <time>", -3.228826155721369),
-                                    ("at <time-of-day>", -3.5165082281731497),
-                                    ("time-of-day (latent)", -1.1811333123561132),
-                                    ("hh:mm", -3.5165082281731497),
-                                    ("until <time>", -3.9219733362813143),
-                                    ("hour", -1.0316015783851495), ("minute", -2.6692103677859462)],
-                               n = 41}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
+                                    ("from|since|after <time>", -3.248434627109745),
+                                    ("at <time-of-day>", -3.536116699561526),
+                                    ("time-of-day (latent)", -1.1689930854299093),
+                                    ("hh:mm", -3.536116699561526),
+                                    ("until <time>", -3.9415818076696905),
+                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
+                               n = 42}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2717,12 +2711,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12260232209233239,
+                     ClassData{prior = -0.13534134786976212,
                                unseen = -4.2626798770413155,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+                     ClassData{prior = -2.0668627594729756,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3612,7 +3607,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.116469906068116, unseen = -4.672828834461907,
+                     ClassData{prior = -1.1340142157190256, unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.054001181677967),
@@ -3635,46 +3630,47 @@ classifiers
                                     ("<time-of-day> am|pm<time-of-day> am|pm", -3.054001181677967)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.3966544784260094, unseen = -5.220355825078324,
+                     ClassData{prior = -0.38822330167365837,
+                               unseen = -5.241747015059643,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.116323468940876),
-                                    ("<time> timezonehhhmm", -4.116323468940876),
+                                   [("hhhmm<time> timezone", -4.137829674161839),
+                                    ("<time> timezonehhhmm", -4.137829674161839),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.5217885770490405),
-                                    ("until <time>time-of-day (latent)", -3.2690256085536724),
-                                    ("from|since|after <time>hh:mm", -4.5217885770490405),
-                                    ("hh:mmtime-of-day (latent)", -2.5068855565067754),
-                                    ("hh:mm<time-of-day> am|pm", -3.2690256085536724),
-                                    ("minuteminute", -2.4423470353692043),
+                                     -4.543294782270004),
+                                    ("until <time>time-of-day (latent)", -3.2905318137746358),
+                                    ("from|since|after <time>hh:mm", -4.543294782270004),
+                                    ("hh:mmtime-of-day (latent)", -2.463853240590168),
+                                    ("hh:mm<time-of-day> am|pm", -3.1570004211501135),
+                                    ("minuteminute", -2.463853240590168),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.6054978451748854),
-                                    ("hh:mmhh:mm", -3.828641396489095),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.116323468940876),
-                                    ("hhhmmhhhmm", -4.116323468940876),
-                                    ("hourhour", -2.03688192726104),
+                                     -3.6270040503958487),
+                                    ("hh:mmhh:mm", -3.8501476017100584),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.137829674161839),
+                                    ("hhhmmhhhmm", -4.137829674161839),
+                                    ("hourhour", -2.0583881324820035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.828641396489095),
-                                    ("hourminute", -3.4231762883809305),
-                                    ("minutehour", -1.6885752329928243),
-                                    ("<time> timezonehh:mm", -4.5217885770490405),
-                                    ("hh:mm<time> timezone", -4.5217885770490405),
-                                    ("hhhmmtime-of-day (latent)", -3.828641396489095),
-                                    ("until <time><time-of-day> am|pm", -4.116323468940876),
+                                     -3.8501476017100584),
+                                    ("hourminute", -3.4446824936018943),
+                                    ("minutehour", -1.6529230243738393),
+                                    ("<time> timezonehh:mm", -4.543294782270004),
+                                    ("hh:mm<time> timezone", -4.543294782270004),
+                                    ("hhhmmtime-of-day (latent)", -3.8501476017100584),
+                                    ("until <time><time-of-day> am|pm", -4.137829674161839),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
-                                    ("<time-of-day> am|pmhh:mm", -4.5217885770490405),
+                                     -4.543294782270004),
+                                    ("<time-of-day> am|pmhh:mm", -4.543294782270004),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.828641396489095),
+                                     -3.8501476017100584),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.0177111802727663),
-                                    ("at <time-of-day>time-of-day (latent)", -3.828641396489095),
-                                    ("<time> timezonetime-of-day (latent)", -3.828641396489095),
+                                     -3.0392173854937297),
+                                    ("at <time-of-day>time-of-day (latent)", -3.8501476017100584),
+                                    ("<time> timezonetime-of-day (latent)", -3.8501476017100584),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
+                                     -4.543294782270004),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.828641396489095)],
-                               n = 76}}),
+                                     -3.8501476017100584)],
+                               n = 78}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_PH.hs b/Duckling/Ranking/Classifiers/EN_PH.hs
index d786cd56..25cb00a0 100644
--- a/Duckling/Ranking/Classifiers/EN_PH.hs
+++ b/Duckling/Ranking/Classifiers/EN_PH.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.53208562319284, unseen = -6.186208623900494,
+                     ClassData{prior = -0.5357197883070597, unseen = -6.186208623900494,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 484},
                    koData =
-                     ClassData{prior = -0.8852249122992647, unseen = -5.834810737062605,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 340}}),
+                     ClassData{prior = -0.8800742478577515, unseen = -5.84354441703136,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 343}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1845,8 +1845,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2187,8 +2187,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2196,13 +2195,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.42050298547270487,
@@ -2434,19 +2428,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6970764586998348, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7009903580209712, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.689233281238809, unseen = -4.875197323201151,
+                     ClassData{prior = -0.6853650401178903, unseen = -4.882801922586371,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15800424914324832),
-                                    ("integer (0..19)", -1.923095471289142)],
-                               n = 128}}),
+                                   [("integer (numeric)", -0.15669845190605702),
+                                    ("integer (0..19)", -1.9307583440347111)],
+                               n = 129}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2551,41 +2545,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2584829177595186, unseen = -5.697093486505405,
+                     ClassData{prior = -0.262364264467491, unseen = -5.703782474656201,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7478219897473863),
-                                    ("integer after|past <hour-of-day>", -4.307437777682809),
-                                    ("at <time-of-day>", -2.3978952727983707),
-                                    ("<time-of-day> o'clock", -4.59511985013459),
-                                    ("half after|past <hour-of-day>", -4.59511985013459),
-                                    ("second", -5.000584958242754),
-                                    ("hh:mm:ss", -5.000584958242754),
-                                    ("<hour-of-day> <integer>", -4.084294226368599),
+                                   [("from|since|after <time>", -3.7545334243353734),
+                                    ("integer after|past <hour-of-day>", -4.314149212270796),
+                                    ("at <time-of-day>", -2.4046067073863573),
+                                    ("<time-of-day> o'clock", -4.601831284722577),
+                                    ("half after|past <hour-of-day>", -4.601831284722577),
+                                    ("second", -4.601831284722577),
+                                    ("hh:mm:ss", -4.601831284722577),
+                                    ("<hour-of-day> <integer>", -4.091005660956586),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.000584958242754),
-                                    ("time-of-day (latent)", -1.6863989535702288),
-                                    ("hhmm (latent)", -5.000584958242754),
-                                    ("hh:mm", -2.3978952727983707),
-                                    ("quarter after|past <hour-of-day>", -3.4965075614664802),
-                                    ("until <time>", -4.307437777682809),
-                                    ("about|exactly <time-of-day>", -5.000584958242754),
-                                    ("hour", -1.2393848425491918),
-                                    ("<time-of-day> sharp|exactly", -5.000584958242754),
-                                    ("minute", -1.7047480922384253)],
-                               n = 139},
+                                     -5.0072963928307415),
+                                    ("time-of-day (latent)", -1.6931103881582155),
+                                    ("hhmm (latent)", -5.0072963928307415),
+                                    ("hh:mm", -2.4046067073863573),
+                                    ("quarter after|past <hour-of-day>", -3.503218996054467),
+                                    ("until <time>", -4.314149212270796),
+                                    ("about|exactly <time-of-day>", -5.0072963928307415),
+                                    ("hour", -1.2460962771371789),
+                                    ("<time-of-day> sharp|exactly", -5.0072963928307415),
+                                    ("minute", -1.7114595268264121)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.4793847841859027, unseen = -4.624972813284271,
+                     ClassData{prior = -1.466337068793427, unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.228826155721369),
-                                    ("from|since|after <time>", -3.228826155721369),
-                                    ("at <time-of-day>", -3.5165082281731497),
-                                    ("time-of-day (latent)", -1.1811333123561132),
-                                    ("hh:mm", -3.5165082281731497),
-                                    ("until <time>", -3.9219733362813143),
-                                    ("hour", -1.0316015783851495), ("minute", -2.6692103677859462)],
-                               n = 41}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
+                                    ("from|since|after <time>", -3.248434627109745),
+                                    ("at <time-of-day>", -3.536116699561526),
+                                    ("time-of-day (latent)", -1.1689930854299093),
+                                    ("hh:mm", -3.536116699561526),
+                                    ("until <time>", -3.9415818076696905),
+                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
+                               n = 42}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2717,12 +2711,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12260232209233239,
+                     ClassData{prior = -0.13534134786976212,
                                unseen = -4.2626798770413155,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+                     ClassData{prior = -2.0668627594729756,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3612,7 +3607,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.116469906068116, unseen = -4.672828834461907,
+                     ClassData{prior = -1.1340142157190256, unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.054001181677967),
@@ -3635,46 +3630,47 @@ classifiers
                                     ("<time-of-day> am|pm<time-of-day> am|pm", -3.054001181677967)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.3966544784260094, unseen = -5.220355825078324,
+                     ClassData{prior = -0.38822330167365837,
+                               unseen = -5.241747015059643,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.116323468940876),
-                                    ("<time> timezonehhhmm", -4.116323468940876),
+                                   [("hhhmm<time> timezone", -4.137829674161839),
+                                    ("<time> timezonehhhmm", -4.137829674161839),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.5217885770490405),
-                                    ("until <time>time-of-day (latent)", -3.2690256085536724),
-                                    ("from|since|after <time>hh:mm", -4.5217885770490405),
-                                    ("hh:mmtime-of-day (latent)", -2.5068855565067754),
-                                    ("hh:mm<time-of-day> am|pm", -3.2690256085536724),
-                                    ("minuteminute", -2.4423470353692043),
+                                     -4.543294782270004),
+                                    ("until <time>time-of-day (latent)", -3.2905318137746358),
+                                    ("from|since|after <time>hh:mm", -4.543294782270004),
+                                    ("hh:mmtime-of-day (latent)", -2.463853240590168),
+                                    ("hh:mm<time-of-day> am|pm", -3.1570004211501135),
+                                    ("minuteminute", -2.463853240590168),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.6054978451748854),
-                                    ("hh:mmhh:mm", -3.828641396489095),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.116323468940876),
-                                    ("hhhmmhhhmm", -4.116323468940876),
-                                    ("hourhour", -2.03688192726104),
+                                     -3.6270040503958487),
+                                    ("hh:mmhh:mm", -3.8501476017100584),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.137829674161839),
+                                    ("hhhmmhhhmm", -4.137829674161839),
+                                    ("hourhour", -2.0583881324820035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.828641396489095),
-                                    ("hourminute", -3.4231762883809305),
-                                    ("minutehour", -1.6885752329928243),
-                                    ("<time> timezonehh:mm", -4.5217885770490405),
-                                    ("hh:mm<time> timezone", -4.5217885770490405),
-                                    ("hhhmmtime-of-day (latent)", -3.828641396489095),
-                                    ("until <time><time-of-day> am|pm", -4.116323468940876),
+                                     -3.8501476017100584),
+                                    ("hourminute", -3.4446824936018943),
+                                    ("minutehour", -1.6529230243738393),
+                                    ("<time> timezonehh:mm", -4.543294782270004),
+                                    ("hh:mm<time> timezone", -4.543294782270004),
+                                    ("hhhmmtime-of-day (latent)", -3.8501476017100584),
+                                    ("until <time><time-of-day> am|pm", -4.137829674161839),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
-                                    ("<time-of-day> am|pmhh:mm", -4.5217885770490405),
+                                     -4.543294782270004),
+                                    ("<time-of-day> am|pmhh:mm", -4.543294782270004),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.828641396489095),
+                                     -3.8501476017100584),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.0177111802727663),
-                                    ("at <time-of-day>time-of-day (latent)", -3.828641396489095),
-                                    ("<time> timezonetime-of-day (latent)", -3.828641396489095),
+                                     -3.0392173854937297),
+                                    ("at <time-of-day>time-of-day (latent)", -3.8501476017100584),
+                                    ("<time> timezonetime-of-day (latent)", -3.8501476017100584),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
+                                     -4.543294782270004),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.828641396489095)],
-                               n = 76}}),
+                                     -3.8501476017100584)],
+                               n = 78}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_TT.hs b/Duckling/Ranking/Classifiers/EN_TT.hs
index 924dc360..bd1f58ab 100644
--- a/Duckling/Ranking/Classifiers/EN_TT.hs
+++ b/Duckling/Ranking/Classifiers/EN_TT.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.53208562319284, unseen = -6.186208623900494,
+                     ClassData{prior = -0.5357197883070597, unseen = -6.186208623900494,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 484},
                    koData =
-                     ClassData{prior = -0.8852249122992647, unseen = -5.834810737062605,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 340}}),
+                     ClassData{prior = -0.8800742478577515, unseen = -5.84354441703136,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 343}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1845,8 +1845,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2187,8 +2187,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2196,13 +2195,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.42050298547270487,
@@ -2434,19 +2428,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6970764586998348, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7009903580209712, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.689233281238809, unseen = -4.875197323201151,
+                     ClassData{prior = -0.6853650401178903, unseen = -4.882801922586371,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15800424914324832),
-                                    ("integer (0..19)", -1.923095471289142)],
-                               n = 128}}),
+                                   [("integer (numeric)", -0.15669845190605702),
+                                    ("integer (0..19)", -1.9307583440347111)],
+                               n = 129}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2551,41 +2545,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2584829177595186, unseen = -5.697093486505405,
+                     ClassData{prior = -0.262364264467491, unseen = -5.703782474656201,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7478219897473863),
-                                    ("integer after|past <hour-of-day>", -4.307437777682809),
-                                    ("at <time-of-day>", -2.3978952727983707),
-                                    ("<time-of-day> o'clock", -4.59511985013459),
-                                    ("half after|past <hour-of-day>", -4.59511985013459),
-                                    ("second", -5.000584958242754),
-                                    ("hh:mm:ss", -5.000584958242754),
-                                    ("<hour-of-day> <integer>", -4.084294226368599),
+                                   [("from|since|after <time>", -3.7545334243353734),
+                                    ("integer after|past <hour-of-day>", -4.314149212270796),
+                                    ("at <time-of-day>", -2.4046067073863573),
+                                    ("<time-of-day> o'clock", -4.601831284722577),
+                                    ("half after|past <hour-of-day>", -4.601831284722577),
+                                    ("second", -4.601831284722577),
+                                    ("hh:mm:ss", -4.601831284722577),
+                                    ("<hour-of-day> <integer>", -4.091005660956586),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.000584958242754),
-                                    ("time-of-day (latent)", -1.6863989535702288),
-                                    ("hhmm (latent)", -5.000584958242754),
-                                    ("hh:mm", -2.3978952727983707),
-                                    ("quarter after|past <hour-of-day>", -3.4965075614664802),
-                                    ("until <time>", -4.307437777682809),
-                                    ("about|exactly <time-of-day>", -5.000584958242754),
-                                    ("hour", -1.2393848425491918),
-                                    ("<time-of-day> sharp|exactly", -5.000584958242754),
-                                    ("minute", -1.7047480922384253)],
-                               n = 139},
+                                     -5.0072963928307415),
+                                    ("time-of-day (latent)", -1.6931103881582155),
+                                    ("hhmm (latent)", -5.0072963928307415),
+                                    ("hh:mm", -2.4046067073863573),
+                                    ("quarter after|past <hour-of-day>", -3.503218996054467),
+                                    ("until <time>", -4.314149212270796),
+                                    ("about|exactly <time-of-day>", -5.0072963928307415),
+                                    ("hour", -1.2460962771371789),
+                                    ("<time-of-day> sharp|exactly", -5.0072963928307415),
+                                    ("minute", -1.7114595268264121)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.4793847841859027, unseen = -4.624972813284271,
+                     ClassData{prior = -1.466337068793427, unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.228826155721369),
-                                    ("from|since|after <time>", -3.228826155721369),
-                                    ("at <time-of-day>", -3.5165082281731497),
-                                    ("time-of-day (latent)", -1.1811333123561132),
-                                    ("hh:mm", -3.5165082281731497),
-                                    ("until <time>", -3.9219733362813143),
-                                    ("hour", -1.0316015783851495), ("minute", -2.6692103677859462)],
-                               n = 41}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
+                                    ("from|since|after <time>", -3.248434627109745),
+                                    ("at <time-of-day>", -3.536116699561526),
+                                    ("time-of-day (latent)", -1.1689930854299093),
+                                    ("hh:mm", -3.536116699561526),
+                                    ("until <time>", -3.9415818076696905),
+                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
+                               n = 42}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2717,12 +2711,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12260232209233239,
+                     ClassData{prior = -0.13534134786976212,
                                unseen = -4.2626798770413155,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+                     ClassData{prior = -2.0668627594729756,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3612,7 +3607,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.116469906068116, unseen = -4.672828834461907,
+                     ClassData{prior = -1.1340142157190256, unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.054001181677967),
@@ -3635,46 +3630,47 @@ classifiers
                                     ("<time-of-day> am|pm<time-of-day> am|pm", -3.054001181677967)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.3966544784260094, unseen = -5.220355825078324,
+                     ClassData{prior = -0.38822330167365837,
+                               unseen = -5.241747015059643,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.116323468940876),
-                                    ("<time> timezonehhhmm", -4.116323468940876),
+                                   [("hhhmm<time> timezone", -4.137829674161839),
+                                    ("<time> timezonehhhmm", -4.137829674161839),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.5217885770490405),
-                                    ("until <time>time-of-day (latent)", -3.2690256085536724),
-                                    ("from|since|after <time>hh:mm", -4.5217885770490405),
-                                    ("hh:mmtime-of-day (latent)", -2.5068855565067754),
-                                    ("hh:mm<time-of-day> am|pm", -3.2690256085536724),
-                                    ("minuteminute", -2.4423470353692043),
+                                     -4.543294782270004),
+                                    ("until <time>time-of-day (latent)", -3.2905318137746358),
+                                    ("from|since|after <time>hh:mm", -4.543294782270004),
+                                    ("hh:mmtime-of-day (latent)", -2.463853240590168),
+                                    ("hh:mm<time-of-day> am|pm", -3.1570004211501135),
+                                    ("minuteminute", -2.463853240590168),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.6054978451748854),
-                                    ("hh:mmhh:mm", -3.828641396489095),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.116323468940876),
-                                    ("hhhmmhhhmm", -4.116323468940876),
-                                    ("hourhour", -2.03688192726104),
+                                     -3.6270040503958487),
+                                    ("hh:mmhh:mm", -3.8501476017100584),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.137829674161839),
+                                    ("hhhmmhhhmm", -4.137829674161839),
+                                    ("hourhour", -2.0583881324820035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.828641396489095),
-                                    ("hourminute", -3.4231762883809305),
-                                    ("minutehour", -1.6885752329928243),
-                                    ("<time> timezonehh:mm", -4.5217885770490405),
-                                    ("hh:mm<time> timezone", -4.5217885770490405),
-                                    ("hhhmmtime-of-day (latent)", -3.828641396489095),
-                                    ("until <time><time-of-day> am|pm", -4.116323468940876),
+                                     -3.8501476017100584),
+                                    ("hourminute", -3.4446824936018943),
+                                    ("minutehour", -1.6529230243738393),
+                                    ("<time> timezonehh:mm", -4.543294782270004),
+                                    ("hh:mm<time> timezone", -4.543294782270004),
+                                    ("hhhmmtime-of-day (latent)", -3.8501476017100584),
+                                    ("until <time><time-of-day> am|pm", -4.137829674161839),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
-                                    ("<time-of-day> am|pmhh:mm", -4.5217885770490405),
+                                     -4.543294782270004),
+                                    ("<time-of-day> am|pmhh:mm", -4.543294782270004),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.828641396489095),
+                                     -3.8501476017100584),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.0177111802727663),
-                                    ("at <time-of-day>time-of-day (latent)", -3.828641396489095),
-                                    ("<time> timezonetime-of-day (latent)", -3.828641396489095),
+                                     -3.0392173854937297),
+                                    ("at <time-of-day>time-of-day (latent)", -3.8501476017100584),
+                                    ("<time> timezonetime-of-day (latent)", -3.8501476017100584),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
+                                     -4.543294782270004),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.828641396489095)],
-                               n = 76}}),
+                                     -3.8501476017100584)],
+                               n = 78}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_US.hs b/Duckling/Ranking/Classifiers/EN_US.hs
index a59f95fa..5aa65dae 100644
--- a/Duckling/Ranking/Classifiers/EN_US.hs
+++ b/Duckling/Ranking/Classifiers/EN_US.hs
@@ -90,11 +90,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5267725591469727, unseen = -6.285998094508865,
+                     ClassData{prior = -0.5300783472814723, unseen = -6.285998094508865,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 535},
                    koData =
-                     ClassData{prior = -0.8928372434355443, unseen = -5.921578419643816,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 371}}),
+                     ClassData{prior = -0.8880892967629469, unseen = -5.929589143389895,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 374}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1957,8 +1957,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2340,8 +2340,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2349,13 +2348,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("Groundhog Day",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2622,19 +2616,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.7048889984366284, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7087724984630261, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.6815416344396374, unseen = -4.890349128221754,
+                     ClassData{prior = -0.6777622617204658, unseen = -4.897839799950911,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15541410387403026),
-                                    ("integer (0..19)", -1.9383629434199303)],
-                               n = 130}}),
+                                   [("integer (numeric)", -0.15415067982725836),
+                                    ("integer (0..19)", -1.9459101490553135)],
+                               n = 131}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2740,41 +2734,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2607262624632527, unseen = -5.71042701737487,
+                     ClassData{prior = -0.26452876747706405,
+                               unseen = -5.717027701406222,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7612001156935624),
-                                    ("integer after|past <hour-of-day>", -4.3208159036289855),
-                                    ("at <time-of-day>", -2.374905754573672),
-                                    ("<time-of-day> o'clock", -4.608497976080766),
-                                    ("half after|past <hour-of-day>", -4.608497976080766),
-                                    ("second", -5.01396308418893), ("hh:mm:ss", -5.01396308418893),
-                                    ("<hour-of-day> <integer>", -4.097672352314775),
+                                   [("from|since|after <time>", -3.767822656454056),
+                                    ("integer after|past <hour-of-day>", -4.327438444389479),
+                                    ("at <time-of-day>", -2.3815282953341654),
+                                    ("<time-of-day> o'clock", -4.61512051684126),
+                                    ("half after|past <hour-of-day>", -4.61512051684126),
+                                    ("second", -4.61512051684126), ("hh:mm:ss", -4.61512051684126),
+                                    ("<hour-of-day> <integer>", -4.104294893075269),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.01396308418893),
-                                    ("time-of-day (latent)", -1.6997770795164049),
-                                    ("hhmm (latent)", -5.01396308418893),
-                                    ("hh:mm", -2.374905754573672),
-                                    ("quarter after|past <hour-of-day>", -3.5098856874126563),
-                                    ("until <time>", -4.3208159036289855),
-                                    ("about|exactly <time-of-day>", -5.01396308418893),
-                                    ("hour", -1.252762968495368),
-                                    ("<time-of-day> sharp|exactly", -5.01396308418893),
-                                    ("minute", -1.6817585740137264)],
-                               n = 141},
+                                     -5.020585624949423),
+                                    ("time-of-day (latent)", -1.7063996202768983),
+                                    ("hhmm (latent)", -5.020585624949423),
+                                    ("hh:mm", -2.3815282953341654),
+                                    ("quarter after|past <hour-of-day>", -3.5165082281731497),
+                                    ("until <time>", -4.327438444389479),
+                                    ("about|exactly <time-of-day>", -5.020585624949423),
+                                    ("hour", -1.2593855092558615),
+                                    ("<time-of-day> sharp|exactly", -5.020585624949423),
+                                    ("minute", -1.68838111477422)],
+                               n = 142},
                    koData =
-                     ClassData{prior = -1.4718165345580525,
-                               unseen = -4.6443908991413725,
+                     ClassData{prior = -1.4591557093847622, unseen = -4.663439094112067,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
-                                    ("from|since|after <time>", -3.248434627109745),
-                                    ("at <time-of-day>", -3.536116699561526),
-                                    ("time-of-day (latent)", -1.1689930854299093),
-                                    ("hh:mm", -3.536116699561526),
-                                    ("until <time>", -3.9415818076696905),
-                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
-                               n = 42}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.2676659890376327),
+                                    ("from|since|after <time>", -3.2676659890376327),
+                                    ("at <time-of-day>", -3.5553480614894135),
+                                    ("time-of-day (latent)", -1.157452788691043),
+                                    ("hh:mm", -3.5553480614894135),
+                                    ("until <time>", -3.960813169597578),
+                                    ("hour", -1.0163741904311376), ("minute", -2.70805020110221)],
+                               n = 43}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2928,13 +2922,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.13353139262452263,
+                     ClassData{prior = -0.14595391262307983,
                                unseen = -4.276666119016055,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 70},
                    koData =
-                     ClassData{prior = -2.0794415416798357,
-                               unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
+                     ClassData{prior = -1.9965538818740682,
+                               unseen = -2.5649493574615367,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 11}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3945,7 +3939,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.1340142157190256, unseen = -4.68213122712422,
+                     ClassData{prior = -1.1512560221535317, unseen = -4.68213122712422,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.0633909220278057),
@@ -3969,48 +3963,47 @@ classifiers
                                      -3.0633909220278057)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.38822330167365837,
-                               unseen = -5.247024072160486,
+                     ClassData{prior = -0.3801473001238745, unseen = -5.267858159063328,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.143134726391533),
-                                    ("<time> timezonehhhmm", -4.143134726391533),
+                                   [("hhhmm<time> timezone", -4.164077900236776),
+                                    ("<time> timezonehhhmm", -4.164077900236776),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.548599834499697),
-                                    ("until <time>time-of-day (latent)", -3.295836866004329),
-                                    ("from|since|after <time>hh:mm", -4.548599834499697),
-                                    ("hh:mmtime-of-day (latent)", -2.5336968139574325),
-                                    ("hh:mm<time-of-day> am|pm", -3.295836866004329),
-                                    ("minuteminute", -2.469158292819861),
+                                     -4.56954300834494),
+                                    ("until <time>time-of-day (latent)", -3.316780039849572),
+                                    ("from|since|after <time>hh:mm", -4.56954300834494),
+                                    ("hh:mmtime-of-day (latent)", -2.4901014666651045),
+                                    ("hh:mm<time-of-day> am|pm", -3.1832486472250494),
+                                    ("minuteminute", -2.4901014666651045),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.632309102625542),
-                                    ("hh:mmhh:mm", -3.855452653939752),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.143134726391533),
-                                    ("hhhmmhhhmm", -4.143134726391533),
-                                    ("at <time-of-day><time-of-day> am|pm", -4.548599834499697),
-                                    ("hourhour", -1.9836504770381604),
+                                     -3.653252276470785),
+                                    ("hh:mmhh:mm", -3.876395827784995),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.164077900236776),
+                                    ("hhhmmhhhmm", -4.164077900236776),
+                                    ("at <time-of-day><time-of-day> am|pm", -4.56954300834494),
+                                    ("hourhour", -2.0045936508834035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.855452653939752),
-                                    ("hourminute", -3.4499875458315876),
-                                    ("minutehour", -1.715386490443481),
-                                    ("<time> timezonehh:mm", -4.548599834499697),
-                                    ("hh:mm<time> timezone", -4.548599834499697),
-                                    ("hhhmmtime-of-day (latent)", -3.855452653939752),
-                                    ("until <time><time-of-day> am|pm", -4.143134726391533),
+                                     -3.876395827784995),
+                                    ("hourminute", -3.4709307196768306),
+                                    ("minutehour", -1.6791712504487755),
+                                    ("<time> timezonehh:mm", -4.56954300834494),
+                                    ("hh:mm<time> timezone", -4.56954300834494),
+                                    ("hhhmmtime-of-day (latent)", -3.876395827784995),
+                                    ("until <time><time-of-day> am|pm", -4.164077900236776),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.548599834499697),
-                                    ("<time-of-day> am|pmhh:mm", -4.548599834499697),
+                                     -4.56954300834494),
+                                    ("<time-of-day> am|pmhh:mm", -4.56954300834494),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.855452653939752),
+                                     -3.876395827784995),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.044522437723423),
-                                    ("at <time-of-day>time-of-day (latent)", -3.632309102625542),
-                                    ("<time> timezonetime-of-day (latent)", -3.855452653939752),
+                                     -3.065465611568666),
+                                    ("at <time-of-day>time-of-day (latent)", -3.653252276470785),
+                                    ("<time> timezonetime-of-day (latent)", -3.876395827784995),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.548599834499697),
+                                     -4.56954300834494),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.855452653939752)],
-                               n = 78}}),
+                                     -3.876395827784995)],
+                               n = 80}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_XX.hs b/Duckling/Ranking/Classifiers/EN_XX.hs
index 0e45c3de..a2dc4210 100644
--- a/Duckling/Ranking/Classifiers/EN_XX.hs
+++ b/Duckling/Ranking/Classifiers/EN_XX.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5633455297429735, unseen = -6.212606095751519,
+                     ClassData{prior = -0.5667760648397627, unseen = -6.212606095751519,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 497},
                    koData =
-                     ClassData{prior = -0.8423464124497076, unseen = -5.934894195619588,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 376}}),
+                     ClassData{prior = -0.8378298858539651, unseen = -5.942799375126701,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 379}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1857,8 +1857,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2200,8 +2200,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2209,13 +2208,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.4166384087062897, unseen = -5.25227342804663,
@@ -2446,19 +2440,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.7126409752409464, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7164945445569365, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.6740261391131669, unseen = -4.90527477843843,
+                     ClassData{prior = -0.6703325027937741, unseen = -4.912654885736052,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15290767158766128),
-                                    ("integer (0..19)", -1.9534008207844709)],
-                               n = 132}}),
+                                   [("integer (numeric)", -0.15168458733206477),
+                                    ("integer (0..19)", -1.960835799271989)],
+                               n = 133}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2563,41 +2557,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2607262624632527, unseen = -5.71042701737487,
+                     ClassData{prior = -0.26452876747706405,
+                               unseen = -5.717027701406222,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7612001156935624),
-                                    ("integer after|past <hour-of-day>", -4.3208159036289855),
-                                    ("at <time-of-day>", -2.374905754573672),
-                                    ("<time-of-day> o'clock", -4.608497976080766),
-                                    ("half after|past <hour-of-day>", -4.608497976080766),
-                                    ("second", -5.01396308418893), ("hh:mm:ss", -5.01396308418893),
-                                    ("<hour-of-day> <integer>", -4.097672352314775),
+                                   [("from|since|after <time>", -3.767822656454056),
+                                    ("integer after|past <hour-of-day>", -4.327438444389479),
+                                    ("at <time-of-day>", -2.3815282953341654),
+                                    ("<time-of-day> o'clock", -4.61512051684126),
+                                    ("half after|past <hour-of-day>", -4.61512051684126),
+                                    ("second", -4.61512051684126), ("hh:mm:ss", -4.61512051684126),
+                                    ("<hour-of-day> <integer>", -4.104294893075269),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.01396308418893),
-                                    ("time-of-day (latent)", -1.6997770795164049),
-                                    ("hhmm (latent)", -5.01396308418893),
-                                    ("hh:mm", -2.374905754573672),
-                                    ("quarter after|past <hour-of-day>", -3.5098856874126563),
-                                    ("until <time>", -4.3208159036289855),
-                                    ("about|exactly <time-of-day>", -5.01396308418893),
-                                    ("hour", -1.252762968495368),
-                                    ("<time-of-day> sharp|exactly", -5.01396308418893),
-                                    ("minute", -1.6817585740137264)],
-                               n = 141},
+                                     -5.020585624949423),
+                                    ("time-of-day (latent)", -1.7063996202768983),
+                                    ("hhmm (latent)", -5.020585624949423),
+                                    ("hh:mm", -2.3815282953341654),
+                                    ("quarter after|past <hour-of-day>", -3.5165082281731497),
+                                    ("until <time>", -4.327438444389479),
+                                    ("about|exactly <time-of-day>", -5.020585624949423),
+                                    ("hour", -1.2593855092558615),
+                                    ("<time-of-day> sharp|exactly", -5.020585624949423),
+                                    ("minute", -1.68838111477422)],
+                               n = 142},
                    koData =
-                     ClassData{prior = -1.4718165345580525,
-                               unseen = -4.6443908991413725,
+                     ClassData{prior = -1.4591557093847622, unseen = -4.663439094112067,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
-                                    ("from|since|after <time>", -3.248434627109745),
-                                    ("at <time-of-day>", -3.536116699561526),
-                                    ("time-of-day (latent)", -1.1689930854299093),
-                                    ("hh:mm", -3.536116699561526),
-                                    ("until <time>", -3.9415818076696905),
-                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
-                               n = 42}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.2676659890376327),
+                                    ("from|since|after <time>", -3.2676659890376327),
+                                    ("at <time-of-day>", -3.5553480614894135),
+                                    ("time-of-day (latent)", -1.157452788691043),
+                                    ("hh:mm", -3.5553480614894135),
+                                    ("until <time>", -3.960813169597578),
+                                    ("hour", -1.0163741904311376), ("minute", -2.70805020110221)],
+                               n = 43}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2737,13 +2731,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.13353139262452263,
+                     ClassData{prior = -0.14595391262307983,
                                unseen = -4.276666119016055,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 70},
                    koData =
-                     ClassData{prior = -2.0794415416798357,
-                               unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
+                     ClassData{prior = -1.9965538818740682,
+                               unseen = -2.5649493574615367,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 11}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3653,7 +3647,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.1340142157190256, unseen = -4.68213122712422,
+                     ClassData{prior = -1.1512560221535317, unseen = -4.68213122712422,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.0633909220278057),
@@ -3677,48 +3671,47 @@ classifiers
                                      -3.0633909220278057)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.38822330167365837,
-                               unseen = -5.247024072160486,
+                     ClassData{prior = -0.3801473001238745, unseen = -5.267858159063328,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.143134726391533),
-                                    ("<time> timezonehhhmm", -4.143134726391533),
+                                   [("hhhmm<time> timezone", -4.164077900236776),
+                                    ("<time> timezonehhhmm", -4.164077900236776),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.548599834499697),
-                                    ("until <time>time-of-day (latent)", -3.295836866004329),
-                                    ("from|since|after <time>hh:mm", -4.548599834499697),
-                                    ("hh:mmtime-of-day (latent)", -2.5336968139574325),
-                                    ("hh:mm<time-of-day> am|pm", -3.295836866004329),
-                                    ("minuteminute", -2.469158292819861),
+                                     -4.56954300834494),
+                                    ("until <time>time-of-day (latent)", -3.316780039849572),
+                                    ("from|since|after <time>hh:mm", -4.56954300834494),
+                                    ("hh:mmtime-of-day (latent)", -2.4901014666651045),
+                                    ("hh:mm<time-of-day> am|pm", -3.1832486472250494),
+                                    ("minuteminute", -2.4901014666651045),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.632309102625542),
-                                    ("hh:mmhh:mm", -3.855452653939752),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.143134726391533),
-                                    ("hhhmmhhhmm", -4.143134726391533),
-                                    ("at <time-of-day><time-of-day> am|pm", -4.548599834499697),
-                                    ("hourhour", -1.9836504770381604),
+                                     -3.653252276470785),
+                                    ("hh:mmhh:mm", -3.876395827784995),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.164077900236776),
+                                    ("hhhmmhhhmm", -4.164077900236776),
+                                    ("at <time-of-day><time-of-day> am|pm", -4.56954300834494),
+                                    ("hourhour", -2.0045936508834035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.855452653939752),
-                                    ("hourminute", -3.4499875458315876),
-                                    ("minutehour", -1.715386490443481),
-                                    ("<time> timezonehh:mm", -4.548599834499697),
-                                    ("hh:mm<time> timezone", -4.548599834499697),
-                                    ("hhhmmtime-of-day (latent)", -3.855452653939752),
-                                    ("until <time><time-of-day> am|pm", -4.143134726391533),
+                                     -3.876395827784995),
+                                    ("hourminute", -3.4709307196768306),
+                                    ("minutehour", -1.6791712504487755),
+                                    ("<time> timezonehh:mm", -4.56954300834494),
+                                    ("hh:mm<time> timezone", -4.56954300834494),
+                                    ("hhhmmtime-of-day (latent)", -3.876395827784995),
+                                    ("until <time><time-of-day> am|pm", -4.164077900236776),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.548599834499697),
-                                    ("<time-of-day> am|pmhh:mm", -4.548599834499697),
+                                     -4.56954300834494),
+                                    ("<time-of-day> am|pmhh:mm", -4.56954300834494),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.855452653939752),
+                                     -3.876395827784995),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.044522437723423),
-                                    ("at <time-of-day>time-of-day (latent)", -3.632309102625542),
-                                    ("<time> timezonetime-of-day (latent)", -3.855452653939752),
+                                     -3.065465611568666),
+                                    ("at <time-of-day>time-of-day (latent)", -3.653252276470785),
+                                    ("<time> timezonetime-of-day (latent)", -3.876395827784995),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.548599834499697),
+                                     -4.56954300834494),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.855452653939752)],
-                               n = 78}}),
+                                     -3.876395827784995)],
+                               n = 80}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/EN_ZA.hs b/Duckling/Ranking/Classifiers/EN_ZA.hs
index 1c99cfd9..cafcbadc 100644
--- a/Duckling/Ranking/Classifiers/EN_ZA.hs
+++ b/Duckling/Ranking/Classifiers/EN_ZA.hs
@@ -83,11 +83,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.53208562319284, unseen = -6.186208623900494,
+                     ClassData{prior = -0.5357197883070597, unseen = -6.186208623900494,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 484},
                    koData =
-                     ClassData{prior = -0.8852249122992647, unseen = -5.834810737062605,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 340}}),
+                     ClassData{prior = -0.8800742478577515, unseen = -5.84354441703136,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 343}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1845,8 +1845,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm:ss",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2187,8 +2187,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:mm) - <time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.0116009116784799),
@@ -2196,13 +2195,8 @@ classifiers
                                     ("minute", -1.9924301646902063)],
                                n = 9},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
                      ClassData{prior = -0.42050298547270487,
@@ -2434,19 +2428,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6970764586998348, unseen = -4.867534450455582,
+                     ClassData{prior = -0.7009903580209712, unseen = -4.867534450455582,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.763846956391606e-2),
                                     ("integer (0..19)", -2.374905754573672)],
                                n = 127},
                    koData =
-                     ClassData{prior = -0.689233281238809, unseen = -4.875197323201151,
+                     ClassData{prior = -0.6853650401178903, unseen = -4.882801922586371,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15800424914324832),
-                                    ("integer (0..19)", -1.923095471289142)],
-                               n = 128}}),
+                                   [("integer (numeric)", -0.15669845190605702),
+                                    ("integer (0..19)", -1.9307583440347111)],
+                               n = 129}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2551,41 +2545,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2584829177595186, unseen = -5.697093486505405,
+                     ClassData{prior = -0.262364264467491, unseen = -5.703782474656201,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.7478219897473863),
-                                    ("integer after|past <hour-of-day>", -4.307437777682809),
-                                    ("at <time-of-day>", -2.3978952727983707),
-                                    ("<time-of-day> o'clock", -4.59511985013459),
-                                    ("half after|past <hour-of-day>", -4.59511985013459),
-                                    ("second", -5.000584958242754),
-                                    ("hh:mm:ss", -5.000584958242754),
-                                    ("<hour-of-day> <integer>", -4.084294226368599),
+                                   [("from|since|after <time>", -3.7545334243353734),
+                                    ("integer after|past <hour-of-day>", -4.314149212270796),
+                                    ("at <time-of-day>", -2.4046067073863573),
+                                    ("<time-of-day> o'clock", -4.601831284722577),
+                                    ("half after|past <hour-of-day>", -4.601831284722577),
+                                    ("second", -4.601831284722577),
+                                    ("hh:mm:ss", -4.601831284722577),
+                                    ("<hour-of-day> <integer>", -4.091005660956586),
                                     ("<integer> minutes to|till|before <hour-of-day>",
-                                     -5.000584958242754),
-                                    ("time-of-day (latent)", -1.6863989535702288),
-                                    ("hhmm (latent)", -5.000584958242754),
-                                    ("hh:mm", -2.3978952727983707),
-                                    ("quarter after|past <hour-of-day>", -3.4965075614664802),
-                                    ("until <time>", -4.307437777682809),
-                                    ("about|exactly <time-of-day>", -5.000584958242754),
-                                    ("hour", -1.2393848425491918),
-                                    ("<time-of-day> sharp|exactly", -5.000584958242754),
-                                    ("minute", -1.7047480922384253)],
-                               n = 139},
+                                     -5.0072963928307415),
+                                    ("time-of-day (latent)", -1.6931103881582155),
+                                    ("hhmm (latent)", -5.0072963928307415),
+                                    ("hh:mm", -2.4046067073863573),
+                                    ("quarter after|past <hour-of-day>", -3.503218996054467),
+                                    ("until <time>", -4.314149212270796),
+                                    ("about|exactly <time-of-day>", -5.0072963928307415),
+                                    ("hour", -1.2460962771371789),
+                                    ("<time-of-day> sharp|exactly", -5.0072963928307415),
+                                    ("minute", -1.7114595268264121)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.4793847841859027, unseen = -4.624972813284271,
+                     ClassData{prior = -1.466337068793427, unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.228826155721369),
-                                    ("from|since|after <time>", -3.228826155721369),
-                                    ("at <time-of-day>", -3.5165082281731497),
-                                    ("time-of-day (latent)", -1.1811333123561132),
-                                    ("hh:mm", -3.5165082281731497),
-                                    ("until <time>", -3.9219733362813143),
-                                    ("hour", -1.0316015783851495), ("minute", -2.6692103677859462)],
-                               n = 41}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.248434627109745),
+                                    ("from|since|after <time>", -3.248434627109745),
+                                    ("at <time-of-day>", -3.536116699561526),
+                                    ("time-of-day (latent)", -1.1689930854299093),
+                                    ("hh:mm", -3.536116699561526),
+                                    ("until <time>", -3.9415818076696905),
+                                    ("hour", -1.0238110755854113), ("minute", -2.6888188391743224)],
+                               n = 42}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2717,12 +2711,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12260232209233239,
+                     ClassData{prior = -0.13534134786976212,
                                unseen = -4.2626798770413155,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+                     ClassData{prior = -2.0668627594729756,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -3612,7 +3607,7 @@ classifiers
                                n = 1}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.116469906068116, unseen = -4.672828834461907,
+                     ClassData{prior = -1.1340142157190256, unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>hh:mm", -3.054001181677967),
@@ -3635,46 +3630,47 @@ classifiers
                                     ("<time-of-day> am|pm<time-of-day> am|pm", -3.054001181677967)],
                                n = 37},
                    koData =
-                     ClassData{prior = -0.3966544784260094, unseen = -5.220355825078324,
+                     ClassData{prior = -0.38822330167365837,
+                               unseen = -5.241747015059643,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hhhmm<time> timezone", -4.116323468940876),
-                                    ("<time> timezonehhhmm", -4.116323468940876),
+                                   [("hhhmm<time> timezone", -4.137829674161839),
+                                    ("<time> timezonehhhmm", -4.137829674161839),
                                     ("about|exactly <time-of-day>time-of-day (latent)",
-                                     -4.5217885770490405),
-                                    ("until <time>time-of-day (latent)", -3.2690256085536724),
-                                    ("from|since|after <time>hh:mm", -4.5217885770490405),
-                                    ("hh:mmtime-of-day (latent)", -2.5068855565067754),
-                                    ("hh:mm<time-of-day> am|pm", -3.2690256085536724),
-                                    ("minuteminute", -2.4423470353692043),
+                                     -4.543294782270004),
+                                    ("until <time>time-of-day (latent)", -3.2905318137746358),
+                                    ("from|since|after <time>hh:mm", -4.543294782270004),
+                                    ("hh:mmtime-of-day (latent)", -2.463853240590168),
+                                    ("hh:mm<time-of-day> am|pm", -3.1570004211501135),
+                                    ("minuteminute", -2.463853240590168),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -3.6054978451748854),
-                                    ("hh:mmhh:mm", -3.828641396489095),
-                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.116323468940876),
-                                    ("hhhmmhhhmm", -4.116323468940876),
-                                    ("hourhour", -2.03688192726104),
+                                     -3.6270040503958487),
+                                    ("hh:mmhh:mm", -3.8501476017100584),
+                                    ("<time-of-day> am|pmtime-of-day (latent)", -4.137829674161839),
+                                    ("hhhmmhhhmm", -4.137829674161839),
+                                    ("hourhour", -2.0583881324820035),
                                     ("from|since|after <time><integer> to|till|before <hour-of-day>",
-                                     -3.828641396489095),
-                                    ("hourminute", -3.4231762883809305),
-                                    ("minutehour", -1.6885752329928243),
-                                    ("<time> timezonehh:mm", -4.5217885770490405),
-                                    ("hh:mm<time> timezone", -4.5217885770490405),
-                                    ("hhhmmtime-of-day (latent)", -3.828641396489095),
-                                    ("until <time><time-of-day> am|pm", -4.116323468940876),
+                                     -3.8501476017100584),
+                                    ("hourminute", -3.4446824936018943),
+                                    ("minutehour", -1.6529230243738393),
+                                    ("<time> timezonehh:mm", -4.543294782270004),
+                                    ("hh:mm<time> timezone", -4.543294782270004),
+                                    ("hhhmmtime-of-day (latent)", -3.8501476017100584),
+                                    ("until <time><time-of-day> am|pm", -4.137829674161839),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
-                                    ("<time-of-day> am|pmhh:mm", -4.5217885770490405),
+                                     -4.543294782270004),
+                                    ("<time-of-day> am|pmhh:mm", -4.543294782270004),
                                     ("<part-of-day> at <time-of-day>time-of-day (latent)",
-                                     -3.828641396489095),
+                                     -3.8501476017100584),
                                     ("from|since|after <time>time-of-day (latent)",
-                                     -3.0177111802727663),
-                                    ("at <time-of-day>time-of-day (latent)", -3.828641396489095),
-                                    ("<time> timezonetime-of-day (latent)", -3.828641396489095),
+                                     -3.0392173854937297),
+                                    ("at <time-of-day>time-of-day (latent)", -3.8501476017100584),
+                                    ("<time> timezonetime-of-day (latent)", -3.8501476017100584),
                                     ("<integer> to|till|before <hour-of-day><time-of-day> am|pm",
-                                     -4.5217885770490405),
+                                     -4.543294782270004),
                                     ("<integer> to|till|before <hour-of-day>time-of-day (latent)",
-                                     -3.828641396489095)],
-                               n = 76}}),
+                                     -3.8501476017100584)],
+                               n = 78}}),
        ("winter",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Time/EN/Corpus.hs b/Duckling/Time/EN/Corpus.hs
index 9fc98ccf..8ca45fbe 100644
--- a/Duckling/Time/EN/Corpus.hs
+++ b/Duckling/Time/EN/Corpus.hs
@@ -601,6 +601,9 @@ allExamples = concat
   , examples (datetime (2013, 2, 12, 15, 23, 24) Second)
              [ "15:23:24"
              ]
+  , examples (datetime (2013, 2, 12, 9, 1, 10) Second)
+             [ "9:01:10 AM"
+             ]
   , examples (datetime (2013, 2, 12, 11, 45, 0) Minute)
              [ "a quarter to noon"
              , "11:45am"
diff --git a/Duckling/Time/EN/Rules.hs b/Duckling/Time/EN/Rules.hs
index 5f415825..3464d9b2 100644
--- a/Duckling/Time/EN/Rules.hs
+++ b/Duckling/Time/EN/Rules.hs
@@ -1449,7 +1449,7 @@ ruleIntervalTODAMPM = Rule
  { name = "hh(:mm) - <time-of-day> am|pm"
  , pattern =
    [ regex "(?:from )?((?:[01]?\\d)|(?:2[0-3]))([:.]([0-5]\\d))?"
-   , regex "\\-|:|to|th?ru|through|(un)?til(l)?"
+   , regex "\\-|to|th?ru|through|(un)?til(l)?"
    , Predicate isATimeOfDay
    , regex "(in the )?([ap])(\\s|\\.)?m?\\.?"
    ]