fix some tag problems