PM and multi-word tagging fixed