Enhance condition checking for Tnt tags