Tag drawing restructure