diff --git a/data/prompt-learning/test/test.soloist.json b/data/prompt-learning/test/test.soloist.json
index 5ee6a08..2b06df9 100644
--- a/data/prompt-learning/test/test.soloist.json
+++ b/data/prompt-learning/test/test.soloist.json
@@ -5086,7 +5086,6 @@
       "moderate",
       "6",
       "12:00",
-      "forward",
       "tuesday",
       "the varsity restaurant",
       "centre",
@@ -5121,7 +5120,6 @@
       "moderate",
       "6",
       "12:00",
-      "forward",
       "tuesday",
       "the varsity restaurant",
       "centre",
@@ -13840,7 +13838,6 @@
       "1",
       "8",
       "3",
-      "forward",
       "thursday",
       "cambridge",
       "guesthouse"
@@ -13878,7 +13875,6 @@
       "1",
       "8",
       "3",
-      "forward",
       "thursday",
       "cambridge",
       "guesthouse"
@@ -16784,7 +16780,7 @@
       "4",
       "18:30",
       "wednesday",
-      "the kohinoor",
+      "kohinoor",
       "centre",
       "indian"
     ],
@@ -16820,7 +16816,7 @@
       "18:30",
       "17:30",
       "wednesday",
-      "the kohinoor",
+      "kohinoor",
       "centre",
       "indian"
     ],
@@ -18932,7 +18928,7 @@
     "values": [
       "12:15",
       "golden house",
-      "night club"
+      "soul tree nightclub"
     ],
     "belief_states": [
       "leave = 12:15",
@@ -18954,7 +18950,7 @@
     "values": [
       "12:15",
       "golden house",
-      "night club"
+      "soul tree nightclub"
     ],
     "belief_states": [
       "leave = 12:15",
@@ -19027,7 +19023,6 @@
     ],
     "values": [
       "05:15",
-      "forward",
       "restaurant",
       "two two",
       "williams art and antiques"
@@ -19055,7 +19050,6 @@
     ],
     "values": [
       "05:15",
-      "forward",
       "restaurant",
       "two two",
       "williams art and antiques"
diff --git a/data/prompt-learning/valid/valid.soloist.json b/data/prompt-learning/valid/valid.soloist.json
index d5e11b8..e8b061c 100644
--- a/data/prompt-learning/valid/valid.soloist.json
+++ b/data/prompt-learning/valid/valid.soloist.json
@@ -1570,7 +1570,6 @@
     ],
     "values": [
       "european",
-      "afghan",
       "north"
     ],
     "belief_states": [
@@ -1591,7 +1590,6 @@
     ],
     "values": [
       "european",
-      "afghan",
       "north"
     ],
     "belief_states": [
@@ -1614,7 +1612,6 @@
     ],
     "values": [
       "european",
-      "afghan",
       "north"
     ],
     "belief_states": [
@@ -4135,7 +4132,7 @@
       "taxi"
     ],
     "values": [
-      "night club"
+      "soul tree nightclub"
     ],
     "belief_states": [
       "destination = soul tree nightclub"
@@ -4152,7 +4149,7 @@
     ],
     "values": [
       "15:30",
-      "night club"
+      "soul tree nightclub"
     ],
     "belief_states": [
       "leave = 15:30",
@@ -4172,7 +4169,7 @@
     ],
     "values": [
       "15:30",
-      "night club"
+      "soul tree nightclub"
     ],
     "belief_states": [
       "leave = 15:30",
@@ -4195,7 +4192,7 @@
     "values": [
       "15:30",
       "tenpin",
-      "night club"
+      "soul tree nightclub"
     ],
     "belief_states": [
       "leave = 15:30",
@@ -4221,7 +4218,7 @@
     "values": [
       "15:30",
       "tenpin",
-      "night club"
+      "soul tree nightclub"
     ],
     "belief_states": [
       "leave = 15:30",
@@ -4249,7 +4246,7 @@
     "values": [
       "15:30",
       "tenpin",
-      "night club"
+      "soul tree nightclub"
     ],
     "belief_states": [
       "leave = 15:30",
@@ -16345,8 +16342,7 @@
     "values": [
       "expensive",
       "1",
-      "european",
-      "german"
+      "european"
     ],
     "belief_states": [
       "food = european",
@@ -16370,8 +16366,7 @@
       "5",
       "15:00",
       "saturday",
-      "european",
-      "german"
+      "european"
     ],
     "belief_states": [
       "food = european",
@@ -16401,8 +16396,7 @@
       "5",
       "15:00",
       "saturday",
-      "european",
-      "german"
+      "european"
     ],
     "belief_states": [
       "food = european",
diff --git a/data/resource/stopwords.txt b/data/resource/stopwords.txt
index ab48ce3..35a98a9 100644
--- a/data/resource/stopwords.txt
+++ b/data/resource/stopwords.txt
@@ -219,6 +219,7 @@ fore
 former
 formerly
 forth
+forward
 four
 from
 fun
diff --git a/utils/regexner.rules b/utils/regexner.rules
index 19521c1..7509f21 100644
--- a/utils/regexner.rules
+++ b/utils/regexner.rules
@@ -173,12 +173,12 @@ mahal	PLACE
 la mimosa	PLACE
 shanghai family restaurant	PLACE
 molecular gastronomy	PLACE
+soul tree nightclub	PLACE
 efes	PLACE
 cote	PLACE
 good luck	PLACE
 cafe uno	PLACE
 oak bistro	PLACE
-european	PLACE
 saffron brasserie	PLACE
 gardenia	PLACE
 de luca cucina and bar	PLACE
@@ -198,7 +198,6 @@ rice house	PLACE
 clowns cafe	PLACE
 hobsons house	PLACE
 dojo noodle bar	PLACE
-the kohinoor	PLACE
 royal standard	PLACE
 bloomsbury restaurant	PLACE
 graffiti	PLACE