Correcting for valid and deprecated tag checks