Tag swing fixes