fixes #3236 so we always add labels/selectors