more fixes for dashboard and modify scenario