Fix overzealous keyword tokenization
Fix for matching numbers