Partial fix to newdashboard, it works but is slower than necessary