Fix Tag Encoding - CR Changes