Make the analyzer and query parser fancier

[fixes #30]