fixing some tag problems