Use dataset setters instead of setAttribute.
"id" -> "ID" in dataset suffixes.
Merge branch 'v3' into watcher