redesign tag structure