fixes #4122 and new charts design