fixed tag issues