Modify logic of tag property