Most changes in place to fix sorting in dashboard