fixing tag issues