rework tag reference