#161 - Fixed performance issue with dashboard