fixed some bug in tag names