performance and chart fix
Revert "performance and chart fix"

This reverts commit ed6233799e7974f03d9189faac90b550e2802404.
Revert "Revert "performance and chart fix""

This reverts commit 18271111465b05490ec65ab3e303dc473b29f9bf.
server: port