4.0.x related bugfix with switching to "with data". Also added titles since we have no legend in 4.1