Make ID fix tags more versatile