Enhance tag fire checking