Minor improvements

Change-Id: I917c2def6174ce649bcb5fff47a31cd821c90831
diff --git a/src/tokenizer.xfst b/src/tokenizer.xfst
index 9b9f663..6b2331e 100644
--- a/src/tokenizer.xfst
+++ b/src/tokenizer.xfst
@@ -209,12 +209,11 @@
 
 echo - Compile Real Token
 
-define RealToken [Punct|Emdash|Word|SNS|AcronymDep|Ord|Num|Years|Times|XMLEntities|Omission];
+define RealToken [Punct|Emdash|Abbr|Streetname|Word|SNS|AcronymDep|Ord|Num|Years|Times|XMLEntities|Omission];
 
 echo - Introduce Token splitter
 
 define Token [
-  [Abbr|Streetname] @-> ... NLout,
   RealToken @-> ... NLout,
   XML @-> ... NLout,
   URL @-> ... NLout,