fixed issue with word appearing more than once in query
improve filtering
stop tracking raw queries in test application
inject filter chain
wrap tokens in token type