badge toggle fixes