Tweaks for entity tagging