Bugfix/551 dashboard performance