Updated to fix an issue where some tags wouldn get the wrong prefix