Tweaks to free text tokenization