plan clustering improvements