Fix CP status sorting to properly respect the zone.