Color coded badges fixes