Improve handling of ecc on tags