fixed some issues with tag changes