Tagging is now mostly working.