Update logic to determine whether tags need to be decrypted for checks