Case insensitive tokenization fixed