Fix: some dashboards get into infinite loop of watches
Merge pull request #157 from EverythingMe/fix_dashboard_watch

Fix: some dashboards get into infinite loop of watches