tag creation logic are modified