remove marks
modify tag to fit 2.1 changes