fixing some tags issues