Enhancement for dashboard. #752