still fixing tag issues