Possible performance improvement for dashboard