Fix for index1 and dashboard demo