Fix Tagging issues