Fix: some dashboards get into infinite loop of watches