Fixed tag bugs