more tag checks added