+ Clean up broken unit tests
+ QueryParser about Tag matching and normalization
+ Remove unused Tokeniser