fixed tag bugs