improve tag model