diff --git a/WebSites/mcu/Dockerfile b/Archived/mcu/Dockerfile
similarity index 100%
rename from WebSites/mcu/Dockerfile
rename to Archived/mcu/Dockerfile
diff --git a/WebSites/mcu/Gruntfile.js b/Archived/mcu/Gruntfile.js
similarity index 100%
rename from WebSites/mcu/Gruntfile.js
rename to Archived/mcu/Gruntfile.js
diff --git a/WebSites/mcu/LICENSE b/Archived/mcu/LICENSE
similarity index 100%
rename from WebSites/mcu/LICENSE
rename to Archived/mcu/LICENSE
diff --git a/WebSites/mcu/README.md b/Archived/mcu/README.md
similarity index 100%
rename from WebSites/mcu/README.md
rename to Archived/mcu/README.md
diff --git a/WebSites/mcu/SlickNav/MIT-LICENSE.txt b/Archived/mcu/SlickNav/MIT-LICENSE.txt
similarity index 100%
rename from WebSites/mcu/SlickNav/MIT-LICENSE.txt
rename to Archived/mcu/SlickNav/MIT-LICENSE.txt
diff --git a/WebSites/mcu/SlickNav/README.md b/Archived/mcu/SlickNav/README.md
similarity index 100%
rename from WebSites/mcu/SlickNav/README.md
rename to Archived/mcu/SlickNav/README.md
diff --git a/WebSites/mcu/SlickNav/bower.json b/Archived/mcu/SlickNav/bower.json
similarity index 100%
rename from WebSites/mcu/SlickNav/bower.json
rename to Archived/mcu/SlickNav/bower.json
diff --git a/WebSites/mcu/SlickNav/demo/index.html b/Archived/mcu/SlickNav/demo/index.html
similarity index 100%
rename from WebSites/mcu/SlickNav/demo/index.html
rename to Archived/mcu/SlickNav/demo/index.html
diff --git a/WebSites/mcu/SlickNav/demo/style.css b/Archived/mcu/SlickNav/demo/style.css
similarity index 100%
rename from WebSites/mcu/SlickNav/demo/style.css
rename to Archived/mcu/SlickNav/demo/style.css
diff --git a/WebSites/mcu/SlickNav/dist/jquery.slicknav.js b/Archived/mcu/SlickNav/dist/jquery.slicknav.js
similarity index 100%
rename from WebSites/mcu/SlickNav/dist/jquery.slicknav.js
rename to Archived/mcu/SlickNav/dist/jquery.slicknav.js
diff --git a/WebSites/mcu/SlickNav/dist/jquery.slicknav.min.js b/Archived/mcu/SlickNav/dist/jquery.slicknav.min.js
similarity index 100%
rename from WebSites/mcu/SlickNav/dist/jquery.slicknav.min.js
rename to Archived/mcu/SlickNav/dist/jquery.slicknav.min.js
diff --git a/WebSites/mcu/SlickNav/dist/slicknav.css b/Archived/mcu/SlickNav/dist/slicknav.css
similarity index 100%
rename from WebSites/mcu/SlickNav/dist/slicknav.css
rename to Archived/mcu/SlickNav/dist/slicknav.css
diff --git a/WebSites/mcu/SlickNav/dist/slicknav.min.css b/Archived/mcu/SlickNav/dist/slicknav.min.css
similarity index 100%
rename from WebSites/mcu/SlickNav/dist/slicknav.min.css
rename to Archived/mcu/SlickNav/dist/slicknav.min.css
diff --git a/WebSites/mcu/SlickNav/gulpfile.js b/Archived/mcu/SlickNav/gulpfile.js
similarity index 100%
rename from WebSites/mcu/SlickNav/gulpfile.js
rename to Archived/mcu/SlickNav/gulpfile.js
diff --git a/WebSites/mcu/SlickNav/jquery.slicknav.js b/Archived/mcu/SlickNav/jquery.slicknav.js
similarity index 100%
rename from WebSites/mcu/SlickNav/jquery.slicknav.js
rename to Archived/mcu/SlickNav/jquery.slicknav.js
diff --git a/WebSites/mcu/SlickNav/package.json b/Archived/mcu/SlickNav/package.json
similarity index 100%
rename from WebSites/mcu/SlickNav/package.json
rename to Archived/mcu/SlickNav/package.json
diff --git a/WebSites/mcu/SlickNav/scss/core.scss b/Archived/mcu/SlickNav/scss/core.scss
similarity index 100%
rename from WebSites/mcu/SlickNav/scss/core.scss
rename to Archived/mcu/SlickNav/scss/core.scss
diff --git a/WebSites/mcu/SlickNav/scss/slicknav.scss b/Archived/mcu/SlickNav/scss/slicknav.scss
similarity index 100%
rename from WebSites/mcu/SlickNav/scss/slicknav.scss
rename to Archived/mcu/SlickNav/scss/slicknav.scss
diff --git a/WebSites/mcu/SlickNav/scss/theme.scss b/Archived/mcu/SlickNav/scss/theme.scss
similarity index 100%
rename from WebSites/mcu/SlickNav/scss/theme.scss
rename to Archived/mcu/SlickNav/scss/theme.scss
diff --git a/WebSites/mcu/css/ess-old.css b/Archived/mcu/css/ess-old.css
similarity index 100%
rename from WebSites/mcu/css/ess-old.css
rename to Archived/mcu/css/ess-old.css
diff --git a/WebSites/mcu/css/ess.css b/Archived/mcu/css/ess.css
similarity index 100%
rename from WebSites/mcu/css/ess.css
rename to Archived/mcu/css/ess.css
diff --git a/WebSites/mcu/css/freeboard.css b/Archived/mcu/css/freeboard.css
similarity index 100%
rename from WebSites/mcu/css/freeboard.css
rename to Archived/mcu/css/freeboard.css
diff --git a/WebSites/mcu/css/freeboard.min.css b/Archived/mcu/css/freeboard.min.css
similarity index 100%
rename from WebSites/mcu/css/freeboard.min.css
rename to Archived/mcu/css/freeboard.min.css
diff --git a/WebSites/mcu/dashboard.json b/Archived/mcu/dashboard.json
similarity index 100%
rename from WebSites/mcu/dashboard.json
rename to Archived/mcu/dashboard.json
diff --git a/WebSites/mcu/docker-compose.yml b/Archived/mcu/docker-compose.yml
similarity index 100%
rename from WebSites/mcu/docker-compose.yml
rename to Archived/mcu/docker-compose.yml
diff --git a/WebSites/mcu/docs/build-docs.sh b/Archived/mcu/docs/build-docs.sh
similarity index 100%
rename from WebSites/mcu/docs/build-docs.sh
rename to Archived/mcu/docs/build-docs.sh
diff --git a/WebSites/mcu/docs/docco-fb.css b/Archived/mcu/docs/docco-fb.css
similarity index 100%
rename from WebSites/mcu/docs/docco-fb.css
rename to Archived/mcu/docs/docco-fb.css
diff --git a/WebSites/mcu/docs/docco.css b/Archived/mcu/docs/docco.css
similarity index 100%
rename from WebSites/mcu/docs/docco.css
rename to Archived/mcu/docs/docco.css
diff --git a/WebSites/mcu/docs/plugin_example.html b/Archived/mcu/docs/plugin_example.html
similarity index 100%
rename from WebSites/mcu/docs/plugin_example.html
rename to Archived/mcu/docs/plugin_example.html
diff --git a/WebSites/mcu/docs/public/fonts/aller-bold.eot b/Archived/mcu/docs/public/fonts/aller-bold.eot
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/aller-bold.eot
rename to Archived/mcu/docs/public/fonts/aller-bold.eot
diff --git a/WebSites/mcu/docs/public/fonts/aller-bold.ttf b/Archived/mcu/docs/public/fonts/aller-bold.ttf
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/aller-bold.ttf
rename to Archived/mcu/docs/public/fonts/aller-bold.ttf
diff --git a/WebSites/mcu/docs/public/fonts/aller-bold.woff b/Archived/mcu/docs/public/fonts/aller-bold.woff
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/aller-bold.woff
rename to Archived/mcu/docs/public/fonts/aller-bold.woff
diff --git a/WebSites/mcu/docs/public/fonts/aller-light.eot b/Archived/mcu/docs/public/fonts/aller-light.eot
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/aller-light.eot
rename to Archived/mcu/docs/public/fonts/aller-light.eot
diff --git a/WebSites/mcu/docs/public/fonts/aller-light.ttf b/Archived/mcu/docs/public/fonts/aller-light.ttf
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/aller-light.ttf
rename to Archived/mcu/docs/public/fonts/aller-light.ttf
diff --git a/WebSites/mcu/docs/public/fonts/aller-light.woff b/Archived/mcu/docs/public/fonts/aller-light.woff
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/aller-light.woff
rename to Archived/mcu/docs/public/fonts/aller-light.woff
diff --git a/WebSites/mcu/docs/public/fonts/fleurons.eot b/Archived/mcu/docs/public/fonts/fleurons.eot
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/fleurons.eot
rename to Archived/mcu/docs/public/fonts/fleurons.eot
diff --git a/WebSites/mcu/docs/public/fonts/fleurons.ttf b/Archived/mcu/docs/public/fonts/fleurons.ttf
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/fleurons.ttf
rename to Archived/mcu/docs/public/fonts/fleurons.ttf
diff --git a/WebSites/mcu/docs/public/fonts/fleurons.woff b/Archived/mcu/docs/public/fonts/fleurons.woff
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/fleurons.woff
rename to Archived/mcu/docs/public/fonts/fleurons.woff
diff --git a/WebSites/mcu/docs/public/fonts/novecento-bold.eot b/Archived/mcu/docs/public/fonts/novecento-bold.eot
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/novecento-bold.eot
rename to Archived/mcu/docs/public/fonts/novecento-bold.eot
diff --git a/WebSites/mcu/docs/public/fonts/novecento-bold.ttf b/Archived/mcu/docs/public/fonts/novecento-bold.ttf
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/novecento-bold.ttf
rename to Archived/mcu/docs/public/fonts/novecento-bold.ttf
diff --git a/WebSites/mcu/docs/public/fonts/novecento-bold.woff b/Archived/mcu/docs/public/fonts/novecento-bold.woff
similarity index 100%
rename from WebSites/mcu/docs/public/fonts/novecento-bold.woff
rename to Archived/mcu/docs/public/fonts/novecento-bold.woff
diff --git a/WebSites/mcu/docs/public/images/gray.png b/Archived/mcu/docs/public/images/gray.png
similarity index 100%
rename from WebSites/mcu/docs/public/images/gray.png
rename to Archived/mcu/docs/public/images/gray.png
diff --git a/WebSites/mcu/docs/public/stylesheets/normalize.css b/Archived/mcu/docs/public/stylesheets/normalize.css
similarity index 100%
rename from WebSites/mcu/docs/public/stylesheets/normalize.css
rename to Archived/mcu/docs/public/stylesheets/normalize.css
diff --git a/WebSites/mcu/examples/altGuage.js b/Archived/mcu/examples/altGuage.js
similarity index 100%
rename from WebSites/mcu/examples/altGuage.js
rename to Archived/mcu/examples/altGuage.js
diff --git a/WebSites/mcu/examples/plugin_example.js b/Archived/mcu/examples/plugin_example.js
similarity index 100%
rename from WebSites/mcu/examples/plugin_example.js
rename to Archived/mcu/examples/plugin_example.js
diff --git a/WebSites/mcu/examples/rl78.json b/Archived/mcu/examples/rl78.json
similarity index 100%
rename from WebSites/mcu/examples/rl78.json
rename to Archived/mcu/examples/rl78.json
diff --git a/WebSites/mcu/examples/weather.json b/Archived/mcu/examples/weather.json
similarity index 100%
rename from WebSites/mcu/examples/weather.json
rename to Archived/mcu/examples/weather.json
diff --git a/WebSites/mcu/favicon.png b/Archived/mcu/favicon.png
similarity index 100%
rename from WebSites/mcu/favicon.png
rename to Archived/mcu/favicon.png
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-200.eot b/Archived/mcu/fonts/titillium-web-v7-latin-200.eot
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-200.eot
rename to Archived/mcu/fonts/titillium-web-v7-latin-200.eot
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-200.svg b/Archived/mcu/fonts/titillium-web-v7-latin-200.svg
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-200.svg
rename to Archived/mcu/fonts/titillium-web-v7-latin-200.svg
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-200.ttf b/Archived/mcu/fonts/titillium-web-v7-latin-200.ttf
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-200.ttf
rename to Archived/mcu/fonts/titillium-web-v7-latin-200.ttf
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-200.woff b/Archived/mcu/fonts/titillium-web-v7-latin-200.woff
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-200.woff
rename to Archived/mcu/fonts/titillium-web-v7-latin-200.woff
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-200.woff2 b/Archived/mcu/fonts/titillium-web-v7-latin-200.woff2
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-200.woff2
rename to Archived/mcu/fonts/titillium-web-v7-latin-200.woff2
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-600.eot b/Archived/mcu/fonts/titillium-web-v7-latin-600.eot
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-600.eot
rename to Archived/mcu/fonts/titillium-web-v7-latin-600.eot
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-600.svg b/Archived/mcu/fonts/titillium-web-v7-latin-600.svg
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-600.svg
rename to Archived/mcu/fonts/titillium-web-v7-latin-600.svg
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-600.ttf b/Archived/mcu/fonts/titillium-web-v7-latin-600.ttf
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-600.ttf
rename to Archived/mcu/fonts/titillium-web-v7-latin-600.ttf
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-600.woff b/Archived/mcu/fonts/titillium-web-v7-latin-600.woff
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-600.woff
rename to Archived/mcu/fonts/titillium-web-v7-latin-600.woff
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-600.woff2 b/Archived/mcu/fonts/titillium-web-v7-latin-600.woff2
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-600.woff2
rename to Archived/mcu/fonts/titillium-web-v7-latin-600.woff2
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-700.eot b/Archived/mcu/fonts/titillium-web-v7-latin-700.eot
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-700.eot
rename to Archived/mcu/fonts/titillium-web-v7-latin-700.eot
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-700.svg b/Archived/mcu/fonts/titillium-web-v7-latin-700.svg
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-700.svg
rename to Archived/mcu/fonts/titillium-web-v7-latin-700.svg
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-700.ttf b/Archived/mcu/fonts/titillium-web-v7-latin-700.ttf
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-700.ttf
rename to Archived/mcu/fonts/titillium-web-v7-latin-700.ttf
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-700.woff b/Archived/mcu/fonts/titillium-web-v7-latin-700.woff
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-700.woff
rename to Archived/mcu/fonts/titillium-web-v7-latin-700.woff
diff --git a/WebSites/mcu/fonts/titillium-web-v7-latin-700.woff2 b/Archived/mcu/fonts/titillium-web-v7-latin-700.woff2
similarity index 100%
rename from WebSites/mcu/fonts/titillium-web-v7-latin-700.woff2
rename to Archived/mcu/fonts/titillium-web-v7-latin-700.woff2
diff --git a/WebSites/mcu/img/dropdown-arrow.png b/Archived/mcu/img/dropdown-arrow.png
similarity index 100%
rename from WebSites/mcu/img/dropdown-arrow.png
rename to Archived/mcu/img/dropdown-arrow.png
diff --git a/WebSites/mcu/img/ess-logo.svg b/Archived/mcu/img/ess-logo.svg
similarity index 100%
rename from WebSites/mcu/img/ess-logo.svg
rename to Archived/mcu/img/ess-logo.svg
diff --git a/WebSites/mcu/img/glyphicons-blackboard.png b/Archived/mcu/img/glyphicons-blackboard.png
similarity index 100%
rename from WebSites/mcu/img/glyphicons-blackboard.png
rename to Archived/mcu/img/glyphicons-blackboard.png
diff --git a/WebSites/mcu/img/glyphicons-halflings-white.png b/Archived/mcu/img/glyphicons-halflings-white.png
similarity index 100%
rename from WebSites/mcu/img/glyphicons-halflings-white.png
rename to Archived/mcu/img/glyphicons-halflings-white.png
diff --git a/WebSites/mcu/img/glyphicons-halflings.png b/Archived/mcu/img/glyphicons-halflings.png
similarity index 100%
rename from WebSites/mcu/img/glyphicons-halflings.png
rename to Archived/mcu/img/glyphicons-halflings.png
diff --git a/WebSites/mcu/img/glyphicons-log-in.png b/Archived/mcu/img/glyphicons-log-in.png
similarity index 100%
rename from WebSites/mcu/img/glyphicons-log-in.png
rename to Archived/mcu/img/glyphicons-log-in.png
diff --git a/WebSites/mcu/img/glyphicons-log-out.png b/Archived/mcu/img/glyphicons-log-out.png
similarity index 100%
rename from WebSites/mcu/img/glyphicons-log-out.png
rename to Archived/mcu/img/glyphicons-log-out.png
diff --git a/WebSites/mcu/img/icons/icon-114.png b/Archived/mcu/img/icons/icon-114.png
similarity index 100%
rename from WebSites/mcu/img/icons/icon-114.png
rename to Archived/mcu/img/icons/icon-114.png
diff --git a/WebSites/mcu/img/icons/icon-144.png b/Archived/mcu/img/icons/icon-144.png
similarity index 100%
rename from WebSites/mcu/img/icons/icon-144.png
rename to Archived/mcu/img/icons/icon-144.png
diff --git a/WebSites/mcu/img/icons/icon-57.png b/Archived/mcu/img/icons/icon-57.png
similarity index 100%
rename from WebSites/mcu/img/icons/icon-57.png
rename to Archived/mcu/img/icons/icon-57.png
diff --git a/WebSites/mcu/img/icons/icon-72.png b/Archived/mcu/img/icons/icon-72.png
similarity index 100%
rename from WebSites/mcu/img/icons/icon-72.png
rename to Archived/mcu/img/icons/icon-72.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@114.png b/Archived/mcu/img/icons/pos_v01_dark@114.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@114.png
rename to Archived/mcu/img/icons/pos_v01_dark@114.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@120.png b/Archived/mcu/img/icons/pos_v01_dark@120.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@120.png
rename to Archived/mcu/img/icons/pos_v01_dark@120.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@144.png b/Archived/mcu/img/icons/pos_v01_dark@144.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@144.png
rename to Archived/mcu/img/icons/pos_v01_dark@144.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@152.png b/Archived/mcu/img/icons/pos_v01_dark@152.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@152.png
rename to Archived/mcu/img/icons/pos_v01_dark@152.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@16.png b/Archived/mcu/img/icons/pos_v01_dark@16.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@16.png
rename to Archived/mcu/img/icons/pos_v01_dark@16.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@180.png b/Archived/mcu/img/icons/pos_v01_dark@180.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@180.png
rename to Archived/mcu/img/icons/pos_v01_dark@180.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@192.png b/Archived/mcu/img/icons/pos_v01_dark@192.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@192.png
rename to Archived/mcu/img/icons/pos_v01_dark@192.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@194.png b/Archived/mcu/img/icons/pos_v01_dark@194.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@194.png
rename to Archived/mcu/img/icons/pos_v01_dark@194.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@32.png b/Archived/mcu/img/icons/pos_v01_dark@32.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@32.png
rename to Archived/mcu/img/icons/pos_v01_dark@32.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@57.png b/Archived/mcu/img/icons/pos_v01_dark@57.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@57.png
rename to Archived/mcu/img/icons/pos_v01_dark@57.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@60.png b/Archived/mcu/img/icons/pos_v01_dark@60.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@60.png
rename to Archived/mcu/img/icons/pos_v01_dark@60.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@72.png b/Archived/mcu/img/icons/pos_v01_dark@72.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@72.png
rename to Archived/mcu/img/icons/pos_v01_dark@72.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@76.png b/Archived/mcu/img/icons/pos_v01_dark@76.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@76.png
rename to Archived/mcu/img/icons/pos_v01_dark@76.png
diff --git a/WebSites/mcu/img/icons/pos_v01_dark@96.png b/Archived/mcu/img/icons/pos_v01_dark@96.png
similarity index 100%
rename from WebSites/mcu/img/icons/pos_v01_dark@96.png
rename to Archived/mcu/img/icons/pos_v01_dark@96.png
diff --git a/WebSites/mcu/img/pos.png b/Archived/mcu/img/pos.png
similarity index 100%
rename from WebSites/mcu/img/pos.png
rename to Archived/mcu/img/pos.png
diff --git a/WebSites/mcu/index.html b/Archived/mcu/index.html
similarity index 100%
rename from WebSites/mcu/index.html
rename to Archived/mcu/index.html
diff --git a/WebSites/mcu/js/bahnhofsuhr.js b/Archived/mcu/js/bahnhofsuhr.js
similarity index 100%
rename from WebSites/mcu/js/bahnhofsuhr.js
rename to Archived/mcu/js/bahnhofsuhr.js
diff --git a/WebSites/mcu/js/freeboard.js b/Archived/mcu/js/freeboard.js
similarity index 100%
rename from WebSites/mcu/js/freeboard.js
rename to Archived/mcu/js/freeboard.js
diff --git a/WebSites/mcu/js/freeboard.min.js b/Archived/mcu/js/freeboard.min.js
similarity index 100%
rename from WebSites/mcu/js/freeboard.min.js
rename to Archived/mcu/js/freeboard.min.js
diff --git a/WebSites/mcu/js/freeboard.min.js.map b/Archived/mcu/js/freeboard.min.js.map
similarity index 100%
rename from WebSites/mcu/js/freeboard.min.js.map
rename to Archived/mcu/js/freeboard.min.js.map
diff --git a/WebSites/mcu/js/freeboard.plugins.js b/Archived/mcu/js/freeboard.plugins.js
similarity index 100%
rename from WebSites/mcu/js/freeboard.plugins.js
rename to Archived/mcu/js/freeboard.plugins.js
diff --git a/WebSites/mcu/js/freeboard.plugins.min.js b/Archived/mcu/js/freeboard.plugins.min.js
similarity index 100%
rename from WebSites/mcu/js/freeboard.plugins.min.js
rename to Archived/mcu/js/freeboard.plugins.min.js
diff --git a/WebSites/mcu/js/freeboard.plugins.min.js.map b/Archived/mcu/js/freeboard.plugins.min.js.map
similarity index 100%
rename from WebSites/mcu/js/freeboard.plugins.min.js.map
rename to Archived/mcu/js/freeboard.plugins.min.js.map
diff --git a/WebSites/mcu/js/freeboard.thirdparty.js b/Archived/mcu/js/freeboard.thirdparty.js
similarity index 100%
rename from WebSites/mcu/js/freeboard.thirdparty.js
rename to Archived/mcu/js/freeboard.thirdparty.js
diff --git a/WebSites/mcu/js/freeboard.thirdparty.min.js b/Archived/mcu/js/freeboard.thirdparty.min.js
similarity index 100%
rename from WebSites/mcu/js/freeboard.thirdparty.min.js
rename to Archived/mcu/js/freeboard.thirdparty.min.js
diff --git a/WebSites/mcu/js/freeboard_plugins.js b/Archived/mcu/js/freeboard_plugins.js
similarity index 100%
rename from WebSites/mcu/js/freeboard_plugins.js
rename to Archived/mcu/js/freeboard_plugins.js
diff --git a/WebSites/mcu/js/freeboard_plugins.min.js b/Archived/mcu/js/freeboard_plugins.min.js
similarity index 100%
rename from WebSites/mcu/js/freeboard_plugins.min.js
rename to Archived/mcu/js/freeboard_plugins.min.js
diff --git a/WebSites/mcu/js/freeboard_plugins.min.js.map b/Archived/mcu/js/freeboard_plugins.min.js.map
similarity index 100%
rename from WebSites/mcu/js/freeboard_plugins.min.js.map
rename to Archived/mcu/js/freeboard_plugins.min.js.map
diff --git a/WebSites/mcu/lib/css/freeboard/styles.css b/Archived/mcu/lib/css/freeboard/styles.css
similarity index 100%
rename from WebSites/mcu/lib/css/freeboard/styles.css
rename to Archived/mcu/lib/css/freeboard/styles.css
diff --git a/WebSites/mcu/lib/css/thirdparty/codemirror-ambiance.css b/Archived/mcu/lib/css/thirdparty/codemirror-ambiance.css
similarity index 100%
rename from WebSites/mcu/lib/css/thirdparty/codemirror-ambiance.css
rename to Archived/mcu/lib/css/thirdparty/codemirror-ambiance.css
diff --git a/WebSites/mcu/lib/css/thirdparty/codemirror.css b/Archived/mcu/lib/css/thirdparty/codemirror.css
similarity index 100%
rename from WebSites/mcu/lib/css/thirdparty/codemirror.css
rename to Archived/mcu/lib/css/thirdparty/codemirror.css
diff --git a/WebSites/mcu/lib/css/thirdparty/jquery.gridster.min.css b/Archived/mcu/lib/css/thirdparty/jquery.gridster.min.css
similarity index 100%
rename from WebSites/mcu/lib/css/thirdparty/jquery.gridster.min.css
rename to Archived/mcu/lib/css/thirdparty/jquery.gridster.min.css
diff --git a/WebSites/mcu/lib/js/freeboard/DatasourceModel.js b/Archived/mcu/lib/js/freeboard/DatasourceModel.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/DatasourceModel.js
rename to Archived/mcu/lib/js/freeboard/DatasourceModel.js
diff --git a/WebSites/mcu/lib/js/freeboard/DeveloperConsole.js b/Archived/mcu/lib/js/freeboard/DeveloperConsole.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/DeveloperConsole.js
rename to Archived/mcu/lib/js/freeboard/DeveloperConsole.js
diff --git a/WebSites/mcu/lib/js/freeboard/DialogBox.js b/Archived/mcu/lib/js/freeboard/DialogBox.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/DialogBox.js
rename to Archived/mcu/lib/js/freeboard/DialogBox.js
diff --git a/WebSites/mcu/lib/js/freeboard/FreeboardModel.js b/Archived/mcu/lib/js/freeboard/FreeboardModel.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/FreeboardModel.js
rename to Archived/mcu/lib/js/freeboard/FreeboardModel.js
diff --git a/WebSites/mcu/lib/js/freeboard/FreeboardUI.js b/Archived/mcu/lib/js/freeboard/FreeboardUI.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/FreeboardUI.js
rename to Archived/mcu/lib/js/freeboard/FreeboardUI.js
diff --git a/WebSites/mcu/lib/js/freeboard/JSEditor.js b/Archived/mcu/lib/js/freeboard/JSEditor.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/JSEditor.js
rename to Archived/mcu/lib/js/freeboard/JSEditor.js
diff --git a/WebSites/mcu/lib/js/freeboard/PaneModel.js b/Archived/mcu/lib/js/freeboard/PaneModel.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/PaneModel.js
rename to Archived/mcu/lib/js/freeboard/PaneModel.js
diff --git a/WebSites/mcu/lib/js/freeboard/PluginEditor.js b/Archived/mcu/lib/js/freeboard/PluginEditor.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/PluginEditor.js
rename to Archived/mcu/lib/js/freeboard/PluginEditor.js
diff --git a/WebSites/mcu/lib/js/freeboard/ValueEditor.js b/Archived/mcu/lib/js/freeboard/ValueEditor.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/ValueEditor.js
rename to Archived/mcu/lib/js/freeboard/ValueEditor.js
diff --git a/WebSites/mcu/lib/js/freeboard/WidgetModel.js b/Archived/mcu/lib/js/freeboard/WidgetModel.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/WidgetModel.js
rename to Archived/mcu/lib/js/freeboard/WidgetModel.js
diff --git a/WebSites/mcu/lib/js/freeboard/freeboard.js b/Archived/mcu/lib/js/freeboard/freeboard.js
similarity index 100%
rename from WebSites/mcu/lib/js/freeboard/freeboard.js
rename to Archived/mcu/lib/js/freeboard/freeboard.js
diff --git a/WebSites/mcu/lib/js/thirdparty/codemirror.js b/Archived/mcu/lib/js/thirdparty/codemirror.js
similarity index 100%
rename from WebSites/mcu/lib/js/thirdparty/codemirror.js
rename to Archived/mcu/lib/js/thirdparty/codemirror.js
diff --git a/WebSites/mcu/lib/js/thirdparty/head.js b/Archived/mcu/lib/js/thirdparty/head.js
similarity index 100%
rename from WebSites/mcu/lib/js/thirdparty/head.js
rename to Archived/mcu/lib/js/thirdparty/head.js
diff --git a/WebSites/mcu/lib/js/thirdparty/jquery-ui.js b/Archived/mcu/lib/js/thirdparty/jquery-ui.js
similarity index 100%
rename from WebSites/mcu/lib/js/thirdparty/jquery-ui.js
rename to Archived/mcu/lib/js/thirdparty/jquery-ui.js
diff --git a/WebSites/mcu/lib/js/thirdparty/jquery.caret.js b/Archived/mcu/lib/js/thirdparty/jquery.caret.js
similarity index 100%
rename from WebSites/mcu/lib/js/thirdparty/jquery.caret.js
rename to Archived/mcu/lib/js/thirdparty/jquery.caret.js
diff --git a/WebSites/mcu/lib/js/thirdparty/jquery.gridster.js b/Archived/mcu/lib/js/thirdparty/jquery.gridster.js
similarity index 100%
rename from WebSites/mcu/lib/js/thirdparty/jquery.gridster.js
rename to Archived/mcu/lib/js/thirdparty/jquery.gridster.js
diff --git a/WebSites/mcu/lib/js/thirdparty/jquery.js b/Archived/mcu/lib/js/thirdparty/jquery.js
similarity index 100%
rename from WebSites/mcu/lib/js/thirdparty/jquery.js
rename to Archived/mcu/lib/js/thirdparty/jquery.js
diff --git a/WebSites/mcu/lib/js/thirdparty/jquery.xdomainrequest.js b/Archived/mcu/lib/js/thirdparty/jquery.xdomainrequest.js
similarity index 100%
rename from WebSites/mcu/lib/js/thirdparty/jquery.xdomainrequest.js
rename to Archived/mcu/lib/js/thirdparty/jquery.xdomainrequest.js
diff --git a/WebSites/mcu/lib/js/thirdparty/knockout.js b/Archived/mcu/lib/js/thirdparty/knockout.js
similarity index 100%
rename from WebSites/mcu/lib/js/thirdparty/knockout.js
rename to Archived/mcu/lib/js/thirdparty/knockout.js
diff --git a/WebSites/mcu/lib/js/thirdparty/underscore-min.map b/Archived/mcu/lib/js/thirdparty/underscore-min.map
similarity index 100%
rename from WebSites/mcu/lib/js/thirdparty/underscore-min.map
rename to Archived/mcu/lib/js/thirdparty/underscore-min.map
diff --git a/WebSites/mcu/lib/js/thirdparty/underscore.js b/Archived/mcu/lib/js/thirdparty/underscore.js
similarity index 100%
rename from WebSites/mcu/lib/js/thirdparty/underscore.js
rename to Archived/mcu/lib/js/thirdparty/underscore.js
diff --git a/WebSites/mcu/package.json b/Archived/mcu/package.json
similarity index 100%
rename from WebSites/mcu/package.json
rename to Archived/mcu/package.json
diff --git a/WebSites/mcu/plugins/freeboard/freeboard.datasources.js b/Archived/mcu/plugins/freeboard/freeboard.datasources.js
similarity index 100%
rename from WebSites/mcu/plugins/freeboard/freeboard.datasources.js
rename to Archived/mcu/plugins/freeboard/freeboard.datasources.js
diff --git a/WebSites/mcu/plugins/freeboard/freeboard.widgets.js b/Archived/mcu/plugins/freeboard/freeboard.widgets.js
similarity index 100%
rename from WebSites/mcu/plugins/freeboard/freeboard.widgets.js
rename to Archived/mcu/plugins/freeboard/freeboard.widgets.js
diff --git a/WebSites/mcu/plugins/thirdparty/flot_extended.plugin.js b/Archived/mcu/plugins/thirdparty/flot_extended.plugin.js
similarity index 100%
rename from WebSites/mcu/plugins/thirdparty/flot_extended.plugin.js
rename to Archived/mcu/plugins/thirdparty/flot_extended.plugin.js
diff --git a/WebSites/mcu/plugins/thirdparty/horizontal_linear_gauge.widgets.js b/Archived/mcu/plugins/thirdparty/horizontal_linear_gauge.widgets.js
similarity index 100%
rename from WebSites/mcu/plugins/thirdparty/horizontal_linear_gauge.widgets.js
rename to Archived/mcu/plugins/thirdparty/horizontal_linear_gauge.widgets.js
diff --git a/WebSites/mcu/plugins/thirdparty/jquery.keyframes.min.js b/Archived/mcu/plugins/thirdparty/jquery.keyframes.min.js
similarity index 100%
rename from WebSites/mcu/plugins/thirdparty/jquery.keyframes.min.js
rename to Archived/mcu/plugins/thirdparty/jquery.keyframes.min.js
diff --git a/WebSites/mcu/plugins/thirdparty/jquery.sparkline.min.js b/Archived/mcu/plugins/thirdparty/jquery.sparkline.min.js
similarity index 100%
rename from WebSites/mcu/plugins/thirdparty/jquery.sparkline.min.js
rename to Archived/mcu/plugins/thirdparty/jquery.sparkline.min.js
diff --git a/WebSites/mcu/plugins/thirdparty/justgage.1.0.1.js b/Archived/mcu/plugins/thirdparty/justgage.1.0.1.js
similarity index 100%
rename from WebSites/mcu/plugins/thirdparty/justgage.1.0.1.js
rename to Archived/mcu/plugins/thirdparty/justgage.1.0.1.js
diff --git a/WebSites/mcu/plugins/thirdparty/plugin_highcharts.js b/Archived/mcu/plugins/thirdparty/plugin_highcharts.js
similarity index 100%
rename from WebSites/mcu/plugins/thirdparty/plugin_highcharts.js
rename to Archived/mcu/plugins/thirdparty/plugin_highcharts.js
diff --git a/WebSites/mcu/plugins/thirdparty/raphael.2.1.0.min.js b/Archived/mcu/plugins/thirdparty/raphael.2.1.0.min.js
similarity index 100%
rename from WebSites/mcu/plugins/thirdparty/raphael.2.1.0.min.js
rename to Archived/mcu/plugins/thirdparty/raphael.2.1.0.min.js
diff --git a/WebSites/mcu/plugins/thirdparty/widget.ragIndicator.js b/Archived/mcu/plugins/thirdparty/widget.ragIndicator.js
similarity index 100%
rename from WebSites/mcu/plugins/thirdparty/widget.ragIndicator.js
rename to Archived/mcu/plugins/thirdparty/widget.ragIndicator.js
diff --git a/WebSites/mcu/test/casper/tests/smoke_test.js b/Archived/mcu/test/casper/tests/smoke_test.js
similarity index 100%
rename from WebSites/mcu/test/casper/tests/smoke_test.js
rename to Archived/mcu/test/casper/tests/smoke_test.js
diff --git a/WebSites/mcu/test/casper/util/test_util.js b/Archived/mcu/test/casper/util/test_util.js
similarity index 100%
rename from WebSites/mcu/test/casper/util/test_util.js
rename to Archived/mcu/test/casper/util/test_util.js
diff --git a/WebSites/mcu/test/fixtures/input.json b/Archived/mcu/test/fixtures/input.json
similarity index 100%
rename from WebSites/mcu/test/fixtures/input.json
rename to Archived/mcu/test/fixtures/input.json
diff --git a/WebSites/mcu/test/run_browser_tests.sh b/Archived/mcu/test/run_browser_tests.sh
similarity index 100%
rename from WebSites/mcu/test/run_browser_tests.sh
rename to Archived/mcu/test/run_browser_tests.sh
diff --git a/WebSites/contacts/dashboard.json b/WebSites/contacts/dashboard.json
index b417ac380a6b78c4a0e0758cf9fc7916f44be156..747693a3ab73f2981d8be3f5c4f904a8cfd09bd0 100644
--- a/WebSites/contacts/dashboard.json
+++ b/WebSites/contacts/dashboard.json
@@ -324,7 +324,7 @@
 			"name": "Contacts",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/NSO:Ops:OCRP,NSO:Ops:SID,NSO:Ops:Msg,NSO:Ops:SL,NSO:Ops:Phone,NSO:Ops:SLPhone,NSO:Ops:SLEmail,NSO:Ops:OP,NSO:Ops:OPPhone,TS2:Ops:Msg,TS2:Ops:SL,TS2:Ops:SLPhone,TS2:Ops:SLPhone,TS2:Ops:SLPhone,TS2:Ops:SLEmail,NSO:Ops:OC,NSO:Ops:OCC,NSO:Ops:OCI,NSO:Ops:OCE",
+				"url": "/data/api/v2/pvget/NSO:Ops:OCRP,NSO:Ops:SID,NSO:Ops:Msg,NSO:Ops:SL,NSO:Ops:Phone,NSO:Ops:SLPhone,NSO:Ops:SLEmail,NSO:Ops:OP,NSO:Ops:OPPhone,TS2:Ops:Msg,TS2:Ops:SL,TS2:Ops:SLPhone,TS2:Ops:SLPhone,TS2:Ops:SLPhone,TS2:Ops:SLEmail,NSO:Ops:OC,NSO:Ops:OCC,NSO:Ops:OCI,NSO:Ops:OCE",
 				"use_thingproxy": false,
 				"refresh": 10,
 				"method": "GET"
diff --git a/WebSites/menu/available-screens.html b/WebSites/menu/available-screens.html
index a952f4d131cd1fc10ceae721749a62f3d6a6ed08..c81b0c9088d848da7aaec2013715b05ee1453800 100644
--- a/WebSites/menu/available-screens.html
+++ b/WebSites/menu/available-screens.html
@@ -16,6 +16,5 @@
     <li><a href="/rfq_skid_exchangervane/">Skid Exchanger and Vane Regulation Loop</a></li>
     <li><a href="/rfq_skid_body/">Skid Body Regulation Loop</a></li>
   </ul>
-<li><a href="/mcu/">Mini Chopper in Utgård Lab</a></li>
 <li><a href="/contacts/">Contacts (only local network)</a></li>
 <li><a href="/pvs/">PV Search Engine</a></li>
diff --git a/WebSites/odh/dashboard.json b/WebSites/odh/dashboard.json
index d2b16e6541703c74beb30ee5b41d0a4fd29c0b51..a438f73fc3713e43b23ded5ce6190e3088feb939 100644
--- a/WebSites/odh/dashboard.json
+++ b/WebSites/odh/dashboard.json
@@ -54,8 +54,8 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "ACH-1",
-						"value": "let pv = \"HCB-ACH:ODH-O2iM-1:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
-						"green_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-1:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
+						"value": "let pv = \"HCB-ACH:ODH-O2iM-1:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
+						"green_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-1:O2Level\"][\"value\"].toFixed(3));\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-1:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-1:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"off_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-1:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";"
@@ -65,7 +65,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "ACH-2",
-						"value": "let pv = \"HCB-ACH:ODH-O2iM-2:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-ACH:ODH-O2iM-2:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-2:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-2:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-2:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -76,7 +76,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "ACH-3",
-						"value": "let pv = \"HCB-ACH:ODH-O2iM-3:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-ACH:ODH-O2iM-3:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-3:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-3:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-3:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -87,7 +87,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "ACH-4",
-						"value": "let pv = \"HCB-ACH:ODH-O2iM-4:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-ACH:ODH-O2iM-4:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-4:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-4:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-4:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -98,7 +98,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "ACH-5",
-						"value": "let pv = \"HCB-ACH:ODH-O2iM-5:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-ACH:ODH-O2iM-5:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-5:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-5:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-ACH:ODH-O2iM-5:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -130,7 +130,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "TCH-6",
-						"value": "let pv = \"HCB-TCH:ODH-O2iM-6:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-TCH:ODH-O2iM-6:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-6:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-6:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-6:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -141,7 +141,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "TCH-7",
-						"value": "let pv = \"HCB-TCH:ODH-O2iM-7:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-TCH:ODH-O2iM-7:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-7:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-7:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-7:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -152,7 +152,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "TCH-8",
-						"value": "let pv = \"HCB-TCH:ODH-O2iM-8:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-TCH:ODH-O2iM-8:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-8:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-8:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-8:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -163,7 +163,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "TCH-9",
-						"value": "let pv = \"HCB-TCH:ODH-O2iM-9:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-TCH:ODH-O2iM-9:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-9:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-9:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-TCH:ODH-O2iM-9:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -195,7 +195,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "HPGS-10",
-						"value": "let pv = \"HCB-HPGS:ODH-O2iM-10:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-HPGS:ODH-O2iM-10:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-HPGS:ODH-O2iM-10:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-HPGS:ODH-O2iM-10:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-HPGS:ODH-O2iM-10:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -206,7 +206,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "HPGS-11",
-						"value": "let pv = \"HCB-HPGS:ODH-O2iM-11:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-HPGS:ODH-O2iM-11:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-HPGS:ODH-O2iM-11:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-HPGS:ODH-O2iM-11:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-HPGS:ODH-O2iM-11:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -238,7 +238,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "CXH-13",
-						"value": "let pv = \"CXB-CXH:ODH-O2iM-13:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"CXB-CXH:ODH-O2iM-13:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-13:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-13:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-13:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -249,7 +249,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "CXH-14",
-						"value": "let pv = \"CXB-CXH:ODH-O2iM-14:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"CXB-CXH:ODH-O2iM-14:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-14:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-14:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-14:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -260,7 +260,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "CXH-15",
-						"value": "let pv = \"CXB-CXH:ODH-O2iM-15:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"CXB-CXH:ODH-O2iM-15:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-15:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-15:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-15:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -271,7 +271,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "CXH-16",
-						"value": "let pv = \"CXB-CXH:ODH-O2iM-16:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"CXB-CXH:ODH-O2iM-16:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-16:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-16:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-16:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -282,7 +282,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "CXH-17",
-						"value": "let pv = \"CXB-CXH:ODH-O2iM-17:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"CXB-CXH:ODH-O2iM-17:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-17:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-17:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-17:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -293,7 +293,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "CXH-18",
-						"value": "let pv = \"CXB-CXH:ODH-O2iM-18:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"CXB-CXH:ODH-O2iM-18:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-18:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-18:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-18:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -304,7 +304,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "CXH-19",
-						"value": "let pv = \"CXB-CXH:ODH-O2iM-19:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"CXB-CXH:ODH-O2iM-19:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-19:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-19:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"CXB-CXH:ODH-O2iM-19:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -336,7 +336,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "CTLG-20",
-						"value": "let pv = \"CTLG-CS:ODH-O2iM-20:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"CTLG-CS:ODH-O2iM-20:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"CTLG-CS:ODH-O2iM-20:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"CTLG-CS:ODH-O2iM-20:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"CTLG-CS:ODH-O2iM-20:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -347,7 +347,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "CTLG-21",
-						"value": "let pv = \"CTLG-CS:ODH-O2iM-21:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"CTLG-CS:ODH-O2iM-21:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"CTLG-CS:ODH-O2iM-21:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"CTLG-CS:ODH-O2iM-21:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"CTLG-CS:ODH-O2iM-21:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -358,7 +358,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "CTLG-22",
-						"value": "let pv = \"CTLG-CS:ODH-O2iM-22:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"CTLG-CS:ODH-O2iM-22:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"CTLG-CS:ODH-O2iM-22:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"CTLG-CS:ODH-O2iM-22:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"CTLG-CS:ODH-O2iM-22:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -390,7 +390,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "TS2-1",
-						"value": "let pv = \"KG-GTA:ODH-O2iM-1:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"KG-GTA:ODH-O2iM-1:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"KG-GTA:ODH-O2iM-1:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"KG-GTA:ODH-O2iM-1:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"KG-GTA:ODH-O2iM-1:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -401,7 +401,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "TS2-2",
-						"value": "let pv = \"KG-GTA:ODH-O2iM-2:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"KG-GTA:ODH-O2iM-2:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"KG-GTA:ODH-O2iM-2:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"KG-GTA:ODH-O2iM-2:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"KG-GTA:ODH-O2iM-2:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -429,7 +429,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "DogSh-12",
-						"value": "let pv = \"HCB-DogSh:ODH-O2iM-12:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"] == 1) {\n    return 0;\n}",
+						"value": "let pv = \"HCB-DogSh:ODH-O2iM-12:\"\n\nif (datasources[\"ODH\"][pv.concat(\"Maint\")][\"value\"][\"index\"] == 1) {\n    return 3;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl18\")][\"value\"][\"index\"] == 0) {\n    return 2;\n}\nif (datasources[\"ODH\"][pv.concat(\"O2Lvl19_5\")][\"value\"][\"index\"] == 0) {\n    return 1;\n}\nif (datasources[\"ODH\"][pv.concat(\"MonitHealthy\")][\"value\"][\"index\"] == 1) {\n    return 0;\n}",
 						"green_text": "value = String(datasources[\"ODH\"][\"HCB-DogSh:ODH-O2iM-12:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"amber_text": "value = String(datasources[\"ODH\"][\"HCB-DogSh:ODH-O2iM-12:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
 						"red_text": "value = String(datasources[\"ODH\"][\"HCB-DogSh:ODH-O2iM-12:O2Level\"][\"value\"].toFixed(3))\nreturn \"<a href=\\\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=HCB-ACH:ODH-O2iM-1:O2Level\\\" target=\\\"_blank\\\">\"+value+\"</a>\";",
@@ -451,7 +451,7 @@
 			"name": "ODH",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/HCB-ACH:ODH-O2iM-1:O2Level,HCB-ACH:ODH-O2iM-1:MonitHealthy,HCB-ACH:ODH-O2iM-1:Maint,HCB-ACH:ODH-O2iM-1:O2Lvl19_5,HCB-ACH:ODH-O2iM-1:O2Lvl18,HCB-ACH:ODH-O2iM-2:O2Level,HCB-ACH:ODH-O2iM-2:MonitHealthy,HCB-ACH:ODH-O2iM-2:Maint,HCB-ACH:ODH-O2iM-2:O2Lvl19_5,HCB-ACH:ODH-O2iM-2:O2Lvl18,HCB-ACH:ODH-O2iM-3:O2Level,HCB-ACH:ODH-O2iM-3:MonitHealthy,HCB-ACH:ODH-O2iM-3:Maint,HCB-ACH:ODH-O2iM-3:O2Lvl19_5,HCB-ACH:ODH-O2iM-3:O2Lvl18,HCB-ACH:ODH-O2iM-4:O2Level,HCB-ACH:ODH-O2iM-4:MonitHealthy,HCB-ACH:ODH-O2iM-4:Maint,HCB-ACH:ODH-O2iM-4:O2Lvl19_5,HCB-ACH:ODH-O2iM-4:O2Lvl18,HCB-ACH:ODH-O2iM-5:O2Level,HCB-ACH:ODH-O2iM-5:MonitHealthy,HCB-ACH:ODH-O2iM-5:Maint,HCB-ACH:ODH-O2iM-5:O2Lvl19_5,HCB-ACH:ODH-O2iM-5:O2Lvl18,HCB-TCH:ODH-O2iM-6:O2Level,HCB-TCH:ODH-O2iM-6:MonitHealthy,HCB-TCH:ODH-O2iM-6:Maint,HCB-TCH:ODH-O2iM-6:O2Lvl19_5,HCB-TCH:ODH-O2iM-6:O2Lvl18,HCB-TCH:ODH-O2iM-7:O2Level,HCB-TCH:ODH-O2iM-7:MonitHealthy,HCB-TCH:ODH-O2iM-7:Maint,HCB-TCH:ODH-O2iM-7:O2Lvl19_5,HCB-TCH:ODH-O2iM-7:O2Lvl18,HCB-TCH:ODH-O2iM-8:O2Level,HCB-TCH:ODH-O2iM-8:MonitHealthy,HCB-TCH:ODH-O2iM-8:Maint,HCB-TCH:ODH-O2iM-8:O2Lvl19_5,HCB-TCH:ODH-O2iM-8:O2Lvl18,HCB-TCH:ODH-O2iM-9:O2Level,HCB-TCH:ODH-O2iM-9:MonitHealthy,HCB-TCH:ODH-O2iM-9:Maint,HCB-TCH:ODH-O2iM-9:O2Lvl19_5,HCB-TCH:ODH-O2iM-9:O2Lvl18,HCB-HPGS:ODH-O2iM-10:O2Level,HCB-HPGS:ODH-O2iM-10:MonitHealthy,HCB-HPGS:ODH-O2iM-10:Maint,HCB-HPGS:ODH-O2iM-10:O2Lvl19_5,HCB-HPGS:ODH-O2iM-10:O2Lvl18,HCB-HPGS:ODH-O2iM-11:O2Level,HCB-HPGS:ODH-O2iM-11:MonitHealthy,HCB-HPGS:ODH-O2iM-11:Maint,HCB-HPGS:ODH-O2iM-11:O2Lvl19_5,HCB-HPGS:ODH-O2iM-11:O2Lvl18,HCB-DogSh:ODH-O2iM-12:O2Level,HCB-DogSh:ODH-O2iM-12:MonitHealthy,HCB-DogSh:ODH-O2iM-12:Maint,HCB-DogSh:ODH-O2iM-12:O2Lvl19_5,HCB-DogSh:ODH-O2iM-12:O2Lvl18,CXB-CXH:ODH-O2iM-13:O2Level,CXB-CXH:ODH-O2iM-13:MonitHealthy,CXB-CXH:ODH-O2iM-13:Maint,CXB-CXH:ODH-O2iM-13:O2Lvl19_5,CXB-CXH:ODH-O2iM-13:O2Lvl18,CXB-CXH:ODH-O2iM-14:O2Level,CXB-CXH:ODH-O2iM-14:MonitHealthy,CXB-CXH:ODH-O2iM-14:Maint,CXB-CXH:ODH-O2iM-14:O2Lvl19_5,CXB-CXH:ODH-O2iM-14:O2Lvl18,CXB-CXH:ODH-O2iM-15:O2Level,CXB-CXH:ODH-O2iM-15:MonitHealthy,CXB-CXH:ODH-O2iM-15:Maint,CXB-CXH:ODH-O2iM-15:O2Lvl19_5,CXB-CXH:ODH-O2iM-15:O2Lvl18,CXB-CXH:ODH-O2iM-16:O2Level,CXB-CXH:ODH-O2iM-16:MonitHealthy,CXB-CXH:ODH-O2iM-16:Maint,CXB-CXH:ODH-O2iM-16:O2Lvl19_5,CXB-CXH:ODH-O2iM-16:O2Lvl18,CXB-CXH:ODH-O2iM-17:O2Level,CXB-CXH:ODH-O2iM-17:MonitHealthy,CXB-CXH:ODH-O2iM-17:Maint,CXB-CXH:ODH-O2iM-17:O2Lvl19_5,CXB-CXH:ODH-O2iM-17:O2Lvl18,CXB-CXH:ODH-O2iM-18:O2Level,CXB-CXH:ODH-O2iM-18:MonitHealthy,CXB-CXH:ODH-O2iM-18:Maint,CXB-CXH:ODH-O2iM-18:O2Lvl19_5,CXB-CXH:ODH-O2iM-18:O2Lvl18,CXB-CXH:ODH-O2iM-19:O2Level,CXB-CXH:ODH-O2iM-19:MonitHealthy,CXB-CXH:ODH-O2iM-19:Maint,CXB-CXH:ODH-O2iM-19:O2Lvl19_5,CXB-CXH:ODH-O2iM-19:O2Lvl18,CTLG-CS:ODH-O2iM-20:O2Level,CTLG-CS:ODH-O2iM-20:MonitHealthy,CTLG-CS:ODH-O2iM-20:Maint,CTLG-CS:ODH-O2iM-20:O2Lvl19_5,CTLG-CS:ODH-O2iM-20:O2Lvl18,CTLG-CS:ODH-O2iM-21:O2Level,CTLG-CS:ODH-O2iM-21:MonitHealthy,CTLG-CS:ODH-O2iM-21:Maint,CTLG-CS:ODH-O2iM-21:O2Lvl19_5,CTLG-CS:ODH-O2iM-21:O2Lvl18,CTLG-CS:ODH-O2iM-22:O2Level,CTLG-CS:ODH-O2iM-22:MonitHealthy,CTLG-CS:ODH-O2iM-22:Maint,CTLG-CS:ODH-O2iM-22:O2Lvl19_5,CTLG-CS:ODH-O2iM-22:O2Lvl18,KG-GTA:ODH-O2iM-1:O2Level,KG-GTA:ODH-O2iM-1:MonitHealthy,KG-GTA:ODH-O2iM-1:Maint,KG-GTA:ODH-O2iM-1:O2Lvl19_5,KG-GTA:ODH-O2iM-1:O2Lvl18,KG-GTA:ODH-O2iM-2:O2Level,KG-GTA:ODH-O2iM-2:MonitHealthy,KG-GTA:ODH-O2iM-2:Maint,KG-GTA:ODH-O2iM-2:O2Lvl19_5,KG-GTA:ODH-O2iM-2:O2Lvl18",
+				"url": "/data/api/v2/pvget/HCB-ACH:ODH-O2iM-1:O2Level,HCB-ACH:ODH-O2iM-1:MonitHealthy,HCB-ACH:ODH-O2iM-1:Maint,HCB-ACH:ODH-O2iM-1:O2Lvl19_5,HCB-ACH:ODH-O2iM-1:O2Lvl18,HCB-ACH:ODH-O2iM-2:O2Level,HCB-ACH:ODH-O2iM-2:MonitHealthy,HCB-ACH:ODH-O2iM-2:Maint,HCB-ACH:ODH-O2iM-2:O2Lvl19_5,HCB-ACH:ODH-O2iM-2:O2Lvl18,HCB-ACH:ODH-O2iM-3:O2Level,HCB-ACH:ODH-O2iM-3:MonitHealthy,HCB-ACH:ODH-O2iM-3:Maint,HCB-ACH:ODH-O2iM-3:O2Lvl19_5,HCB-ACH:ODH-O2iM-3:O2Lvl18,HCB-ACH:ODH-O2iM-4:O2Level,HCB-ACH:ODH-O2iM-4:MonitHealthy,HCB-ACH:ODH-O2iM-4:Maint,HCB-ACH:ODH-O2iM-4:O2Lvl19_5,HCB-ACH:ODH-O2iM-4:O2Lvl18,HCB-ACH:ODH-O2iM-5:O2Level,HCB-ACH:ODH-O2iM-5:MonitHealthy,HCB-ACH:ODH-O2iM-5:Maint,HCB-ACH:ODH-O2iM-5:O2Lvl19_5,HCB-ACH:ODH-O2iM-5:O2Lvl18,HCB-TCH:ODH-O2iM-6:O2Level,HCB-TCH:ODH-O2iM-6:MonitHealthy,HCB-TCH:ODH-O2iM-6:Maint,HCB-TCH:ODH-O2iM-6:O2Lvl19_5,HCB-TCH:ODH-O2iM-6:O2Lvl18,HCB-TCH:ODH-O2iM-7:O2Level,HCB-TCH:ODH-O2iM-7:MonitHealthy,HCB-TCH:ODH-O2iM-7:Maint,HCB-TCH:ODH-O2iM-7:O2Lvl19_5,HCB-TCH:ODH-O2iM-7:O2Lvl18,HCB-TCH:ODH-O2iM-8:O2Level,HCB-TCH:ODH-O2iM-8:MonitHealthy,HCB-TCH:ODH-O2iM-8:Maint,HCB-TCH:ODH-O2iM-8:O2Lvl19_5,HCB-TCH:ODH-O2iM-8:O2Lvl18,HCB-TCH:ODH-O2iM-9:O2Level,HCB-TCH:ODH-O2iM-9:MonitHealthy,HCB-TCH:ODH-O2iM-9:Maint,HCB-TCH:ODH-O2iM-9:O2Lvl19_5,HCB-TCH:ODH-O2iM-9:O2Lvl18,HCB-HPGS:ODH-O2iM-10:O2Level,HCB-HPGS:ODH-O2iM-10:MonitHealthy,HCB-HPGS:ODH-O2iM-10:Maint,HCB-HPGS:ODH-O2iM-10:O2Lvl19_5,HCB-HPGS:ODH-O2iM-10:O2Lvl18,HCB-HPGS:ODH-O2iM-11:O2Level,HCB-HPGS:ODH-O2iM-11:MonitHealthy,HCB-HPGS:ODH-O2iM-11:Maint,HCB-HPGS:ODH-O2iM-11:O2Lvl19_5,HCB-HPGS:ODH-O2iM-11:O2Lvl18,HCB-DogSh:ODH-O2iM-12:O2Level,HCB-DogSh:ODH-O2iM-12:MonitHealthy,HCB-DogSh:ODH-O2iM-12:Maint,HCB-DogSh:ODH-O2iM-12:O2Lvl19_5,HCB-DogSh:ODH-O2iM-12:O2Lvl18,CXB-CXH:ODH-O2iM-13:O2Level,CXB-CXH:ODH-O2iM-13:MonitHealthy,CXB-CXH:ODH-O2iM-13:Maint,CXB-CXH:ODH-O2iM-13:O2Lvl19_5,CXB-CXH:ODH-O2iM-13:O2Lvl18,CXB-CXH:ODH-O2iM-14:O2Level,CXB-CXH:ODH-O2iM-14:MonitHealthy,CXB-CXH:ODH-O2iM-14:Maint,CXB-CXH:ODH-O2iM-14:O2Lvl19_5,CXB-CXH:ODH-O2iM-14:O2Lvl18,CXB-CXH:ODH-O2iM-15:O2Level,CXB-CXH:ODH-O2iM-15:MonitHealthy,CXB-CXH:ODH-O2iM-15:Maint,CXB-CXH:ODH-O2iM-15:O2Lvl19_5,CXB-CXH:ODH-O2iM-15:O2Lvl18,CXB-CXH:ODH-O2iM-16:O2Level,CXB-CXH:ODH-O2iM-16:MonitHealthy,CXB-CXH:ODH-O2iM-16:Maint,CXB-CXH:ODH-O2iM-16:O2Lvl19_5,CXB-CXH:ODH-O2iM-16:O2Lvl18,CXB-CXH:ODH-O2iM-17:O2Level,CXB-CXH:ODH-O2iM-17:MonitHealthy,CXB-CXH:ODH-O2iM-17:Maint,CXB-CXH:ODH-O2iM-17:O2Lvl19_5,CXB-CXH:ODH-O2iM-17:O2Lvl18,CXB-CXH:ODH-O2iM-18:O2Level,CXB-CXH:ODH-O2iM-18:MonitHealthy,CXB-CXH:ODH-O2iM-18:Maint,CXB-CXH:ODH-O2iM-18:O2Lvl19_5,CXB-CXH:ODH-O2iM-18:O2Lvl18,CXB-CXH:ODH-O2iM-19:O2Level,CXB-CXH:ODH-O2iM-19:MonitHealthy,CXB-CXH:ODH-O2iM-19:Maint,CXB-CXH:ODH-O2iM-19:O2Lvl19_5,CXB-CXH:ODH-O2iM-19:O2Lvl18,CTLG-CS:ODH-O2iM-20:O2Level,CTLG-CS:ODH-O2iM-20:MonitHealthy,CTLG-CS:ODH-O2iM-20:Maint,CTLG-CS:ODH-O2iM-20:O2Lvl19_5,CTLG-CS:ODH-O2iM-20:O2Lvl18,CTLG-CS:ODH-O2iM-21:O2Level,CTLG-CS:ODH-O2iM-21:MonitHealthy,CTLG-CS:ODH-O2iM-21:Maint,CTLG-CS:ODH-O2iM-21:O2Lvl19_5,CTLG-CS:ODH-O2iM-21:O2Lvl18,CTLG-CS:ODH-O2iM-22:O2Level,CTLG-CS:ODH-O2iM-22:MonitHealthy,CTLG-CS:ODH-O2iM-22:Maint,CTLG-CS:ODH-O2iM-22:O2Lvl19_5,CTLG-CS:ODH-O2iM-22:O2Lvl18,KG-GTA:ODH-O2iM-1:O2Level,KG-GTA:ODH-O2iM-1:MonitHealthy,KG-GTA:ODH-O2iM-1:Maint,KG-GTA:ODH-O2iM-1:O2Lvl19_5,KG-GTA:ODH-O2iM-1:O2Lvl18,KG-GTA:ODH-O2iM-2:O2Level,KG-GTA:ODH-O2iM-2:MonitHealthy,KG-GTA:ODH-O2iM-2:Maint,KG-GTA:ODH-O2iM-2:O2Lvl19_5,KG-GTA:ODH-O2iM-2:O2Lvl18",
 				"use_thingproxy": false,
 				"refresh": 5,
 				"method": "GET",
diff --git a/WebSites/pss_permits/dashboard.json b/WebSites/pss_permits/dashboard.json
index 74656c4d240b659f5ca99d1c8fe6feddfcac9ba1..c4556ff71d948e5e5996f594508a70a4f7f175a3 100644
--- a/WebSites/pss_permits/dashboard.json
+++ b/WebSites/pss_permits/dashboard.json
@@ -38,21 +38,23 @@
 				"2": 15,
 				"3": 7,
 				"4": 7,
-				"5": 7
+				"5": 7,
+				"7": 7
 			},
 			"col": {
 				"1": 1,
 				"2": 2,
 				"3": 3,
 				"4": 4,
-				"5": 4
+				"5": 4,
+				"7": 4
 			},
 			"col_width": 1,
 			"widgets": [
 				{
 					"type": "ragIndicator",
 					"settings": {
-						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-4:MEBT1_PermitOn\"][\"value\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}\n",
+						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-4:MEBT1_PermitOn\"][\"value\"][\"index\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}\n",
 						"green_text": "MEBT1 Buncher 1",
 						"amber_text": "MEBT1 Buncher 1",
 						"red_text": "MEBT1 Buncher 1"
@@ -61,7 +63,7 @@
 				{
 					"type": "ragIndicator",
 					"settings": {
-						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-4:MEBT2_PermitOn\"][\"value\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}",
+						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-4:MEBT2_PermitOn\"][\"value\"][\"index\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}",
 						"green_text": "MEBT3 Buncher 2",
 						"amber_text": "MEBT3 Buncher 2",
 						"red_text": "MEBT3 Buncher 2"
@@ -70,7 +72,7 @@
 				{
 					"type": "ragIndicator",
 					"settings": {
-						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-4:MEBT3_PermitOn\"][\"value\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}\n",
+						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-4:MEBT3_PermitOn\"][\"value\"][\"index\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}\n",
 						"green_text": "MEBT3 Buncher 3",
 						"amber_text": "MEBT3 Buncher 3",
 						"red_text": "MEBT3 Buncher 3"
@@ -86,21 +88,23 @@
 				"2": 7,
 				"3": 7,
 				"4": 7,
-				"6": 7
+				"6": 7,
+				"7": 7
 			},
 			"col": {
 				"1": 1,
 				"2": 2,
 				"3": 2,
 				"4": 3,
-				"6": 3
+				"6": 3,
+				"7": 3
 			},
 			"col_width": 1,
 			"widgets": [
 				{
 					"type": "ragIndicator",
 					"settings": {
-						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-1:RFQDTL1_PermitOn\"][\"value\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}",
+						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-1:RFQDTL1_PermitOn\"][\"value\"][\"index\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}",
 						"green_text": "RFQ and DTL1",
 						"amber_text": "RFQ and DTL1",
 						"red_text": "RFQ and DTL1"
@@ -109,7 +113,7 @@
 				{
 					"type": "ragIndicator",
 					"settings": {
-						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-2:DTL2DTL3_PermitOn\"][\"value\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}",
+						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-2:DTL2DTL3_PermitOn\"][\"value\"][\"index\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}",
 						"green_text": "DTL2 and DTL3",
 						"amber_text": "DTL2 and DTL3",
 						"red_text": "DTL2 and DTL3"
@@ -118,7 +122,7 @@
 				{
 					"type": "ragIndicator",
 					"settings": {
-						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-3:DTL4_PermitOn\"][\"value\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}\n",
+						"value": "switch (datasources[\"Interlocks\"][\"KG-NCG:PSS-ICC-3:DTL4_PermitOn\"][\"value\"][\"index\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}\n",
 						"green_text": "DTL4",
 						"amber_text": "DTL4",
 						"red_text": "DTL4"
@@ -134,14 +138,16 @@
 				"2": 7,
 				"3": 7,
 				"4": 7,
-				"6": 7
+				"6": 7,
+				"7": 7
 			},
 			"col": {
 				"1": 1,
 				"2": 1,
 				"3": 1,
 				"4": 1,
-				"6": 1
+				"6": 1,
+				"7": 1
 			},
 			"col_width": 1,
 			"widgets": [
@@ -149,7 +155,7 @@
 					"type": "text_widget",
 					"settings": {
 						"size": "regular",
-						"value": "switch(datasources[\"Interlocks\"][\"AccPSS:PSS-Area-1:PSSMode\"][\"value\"]) {\n  case 0:\n    return \"Alarm\";\n    break;\n  case 1:\n    return \"Open Access\";\n    break;\n  case 2:\n    return \"Search\";\n    break; \n  case 3:\n    return \"Tunnel Closed\";\n    break;\n  case 4:\n    return \"Beam On\";\n    break;\n  case 5:\n    return \"RM Interlock\";\n    break;\n  case 6:\n    return \"RP Survey\";\n    break;\n  case 7:\n    return \"Restricted Access\";\n    break;\n  default:\n    // code block\n}",
+						"value": "datasources[\"Interlocks\"][\"AccPSS:PSS-Area-1:PSSMode\"][\"value\"][\"choices\"][datasources[\"Interlocks\"][\"AccPSS:PSS-Area-1:PSSMode\"][\"value\"][\"index\"]];",
 						"animate": true
 					}
 				}
@@ -163,14 +169,16 @@
 				"2": 11,
 				"3": 11,
 				"4": 7,
-				"6": 7
+				"6": 7,
+				"7": 7
 			},
 			"col": {
 				"1": 1,
 				"2": 1,
 				"3": 1,
 				"4": 2,
-				"6": 2
+				"6": 2,
+				"7": 2
 			},
 			"col_width": 1,
 			"widgets": [
@@ -178,7 +186,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "",
-						"value": "switch (datasources[\"Interlocks\"][\"FEB-010Row:CnPw-U-007:ISrcHVPS_PermitOn\"][\"value\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}",
+						"value": "switch (datasources[\"Interlocks\"][\"FEB-010Row:CnPw-U-007:ISrcHVPS_PermitOn\"][\"value\"][\"index\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}",
 						"green_text": "ISrc HVPS",
 						"amber_text": "ISrc HVPS",
 						"red_text": "ISrc HVPS",
@@ -188,7 +196,7 @@
 				{
 					"type": "ragIndicator",
 					"settings": {
-						"value": "switch (datasources[\"Interlocks\"][\"AccPSS-Z0:PSS-RIO-4:ISrcMagPS_PermitOn\"][\"value\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}",
+						"value": "switch (datasources[\"Interlocks\"][\"AccPSS-Z0:PSS-RIO-4:ISrcMagPS_PermitOn\"][\"value\"][\"index\"]) {\n    case 1:\n        return 0;\n    break;\n    default:\n    \treturn 2;\n}",
 						"green_text": "ISrc Magnetron PS",
 						"amber_text": "ISrc Magnetron PS",
 						"red_text": "ISrc Magnetron PS"
@@ -202,10 +210,11 @@
 			"name": "Interlocks",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/AccPSS:PSS-Area-1:PSSMode,FEB-010Row:CnPw-U-007:ISrcHVPS_PermitOn,AccPSS-Z0:PSS-RIO-4:ISrcMagPS_PermitOn,KG-NCG:PSS-ICC-1:RFQDTL1_PermitOn,KG-NCG:PSS-ICC-2:DTL2DTL3_PermitOn,KG-NCG:PSS-ICC-3:DTL4_PermitOn,KG-NCG:PSS-ICC-4:MEBT1_PermitOn,KG-NCG:PSS-ICC-4:MEBT2_PermitOn,KG-NCG:PSS-ICC-4:MEBT3_PermitOn",
+				"url": "/data/api/v2/pvget/AccPSS:PSS-Area-1:PSSMode,FEB-010Row:CnPw-U-007:ISrcHVPS_PermitOn,AccPSS-Z0:PSS-RIO-4:ISrcMagPS_PermitOn,KG-NCG:PSS-ICC-1:RFQDTL1_PermitOn,KG-NCG:PSS-ICC-2:DTL2DTL3_PermitOn,KG-NCG:PSS-ICC-3:DTL4_PermitOn,KG-NCG:PSS-ICC-4:MEBT1_PermitOn,KG-NCG:PSS-ICC-4:MEBT2_PermitOn,KG-NCG:PSS-ICC-4:MEBT3_PermitOn",
 				"use_thingproxy": false,
 				"refresh": 10,
-				"method": "GET"
+				"method": "GET",
+				"name": "Interlocks"
 			}
 		},
 		{
diff --git a/WebSites/rfq_cooling/dashboard.json b/WebSites/rfq_cooling/dashboard.json
index 17658e3305a7436a09f0364ff5bcce5e222a61a4..eacd9f4139ed022e2e23f29f5f465dffd8d2d027 100644
--- a/WebSites/rfq_cooling/dashboard.json
+++ b/WebSites/rfq_cooling/dashboard.json
@@ -350,7 +350,7 @@
       "name" : "RFQ",
       "type" : "JSON",
       "settings" : {
-        "url" : "/data/api/v1/caget/CWM-CWS03:WtrC-TT-010:Temperature,CWM-CWS03:WtrC-TT-020:Temperature,CWM-CWS03:WtrC-TT-030:Temperature,CWM-CWS03:WtrC-TT-040:Temperature,CWM-CWS03:WtrC-TT-050:Temperature,CWM-CWS03::FreqDetuned",
+        "url" : "/data/api/v2/pvget/CWM-CWS03:WtrC-TT-010:Temperature,CWM-CWS03:WtrC-TT-020:Temperature,CWM-CWS03:WtrC-TT-030:Temperature,CWM-CWS03:WtrC-TT-040:Temperature,CWM-CWS03:WtrC-TT-050:Temperature,CWM-CWS03::FreqDetuned",
         "use_thingproxy" : false,
         "refresh" : 10,
         "method" : "GET"
diff --git a/WebSites/rfq_skid_body/dashboard.json b/WebSites/rfq_skid_body/dashboard.json
index 82cab06ca5c5181cd68b0ff4b61c8d9ab8836653..42d52ef078ef725feb599cecdd44d6fe19cd1dca 100644
--- a/WebSites/rfq_skid_body/dashboard.json
+++ b/WebSites/rfq_skid_body/dashboard.json
@@ -274,7 +274,7 @@
 			"name": "RFQ",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/CWM-CWS03::PID_BodyS1S2_TT30-S,CWM-CWS03:WtrC-TT-030:Temperature,CWM-CWS03:WtrC-PCV-030:Opening,CWM-CWS03::PID_BodyS1S2_Kp,CWM-CWS03::PID_BodyS1S2_Ti,CWM-CWS03::PID_BodyS1S2_Td,CWM-CWS03::PID_BodyS3_TT40-S,CWM-CWS03:WtrC-TT-040:Temperature,CWM-CWS03:WtrC-PCV-040:Opening,CWM-CWS03::PID_BodyS3_Kp,CWM-CWS03::PID_BodyS3_Ti,CWM-CWS03::PID_BodyS3_Td,CWM-CWS03::PID_BodyS4S5_TT50-S,CWM-CWS03:WtrC-TT-050:Temperature,CWM-CWS03:WtrC-PCV-050:Opening,CWM-CWS03::PID_BodyS4S5_Kp,CWM-CWS03::PID_BodyS4S5_Ti,CWM-CWS03::PID_BodyS4S5_Td",
+				"url": "/data/api/v2/pvget/CWM-CWS03::PID_BodyS1S2_TT30-S,CWM-CWS03:WtrC-TT-030:Temperature,CWM-CWS03:WtrC-PCV-030:Opening,CWM-CWS03::PID_BodyS1S2_Kp,CWM-CWS03::PID_BodyS1S2_Ti,CWM-CWS03::PID_BodyS1S2_Td,CWM-CWS03::PID_BodyS3_TT40-S,CWM-CWS03:WtrC-TT-040:Temperature,CWM-CWS03:WtrC-PCV-040:Opening,CWM-CWS03::PID_BodyS3_Kp,CWM-CWS03::PID_BodyS3_Ti,CWM-CWS03::PID_BodyS3_Td,CWM-CWS03::PID_BodyS4S5_TT50-S,CWM-CWS03:WtrC-TT-050:Temperature,CWM-CWS03:WtrC-PCV-050:Opening,CWM-CWS03::PID_BodyS4S5_Kp,CWM-CWS03::PID_BodyS4S5_Ti,CWM-CWS03::PID_BodyS4S5_Td",
 				"use_thingproxy": false,
 				"refresh": 10,
 				"method": "GET"
diff --git a/WebSites/rfq_skid_exchangervane/dashboard.json b/WebSites/rfq_skid_exchangervane/dashboard.json
index 6c077dc79e42e785c6500322a8aa4a97be112f9c..fd111259bc6cc9f11ea3a60c58c987e0c590005e 100644
--- a/WebSites/rfq_skid_exchangervane/dashboard.json
+++ b/WebSites/rfq_skid_exchangervane/dashboard.json
@@ -256,7 +256,7 @@
 			"name": "RFQ",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/CWM-CWS03::PID_Exchanger_TT10-S,CWM-CWS03:WtrC-TT-010:Temperature,CWM-CWS03:WtrC-PCV-010:Opening,CWM-CWS03::PID_Exchanger_Kp,CWM-CWS03::PID_Exchanger_Ti,CWM-CWS03::PID_Exchanger_Td,CWM-CWS03::PID_VaneT_TT20-S,CWM-CWS03:WtrC-TT-020:Temperature,CWM-CWS03:WtrC-PCV-020:Opening,CWM-CWS03::PID_VaneT_Kp,CWM-CWS03::PID_VaneT_Ti,CWM-CWS03::PID_VaneT_Td,CWM-CWS03::PID_VaneDP_DP-S,CWM-CWS03::FreqDetuned,CWM-CWS03::PID_VaneDP_Kp,CWM-CWS03::PID_VaneDP_Ti,CWM-CWS03::PID_VaneDP_Td",
+				"url": "/data/api/v2/pvget/CWM-CWS03::PID_Exchanger_TT10-S,CWM-CWS03:WtrC-TT-010:Temperature,CWM-CWS03:WtrC-PCV-010:Opening,CWM-CWS03::PID_Exchanger_Kp,CWM-CWS03::PID_Exchanger_Ti,CWM-CWS03::PID_Exchanger_Td,CWM-CWS03::PID_VaneT_TT20-S,CWM-CWS03:WtrC-TT-020:Temperature,CWM-CWS03:WtrC-PCV-020:Opening,CWM-CWS03::PID_VaneT_Kp,CWM-CWS03::PID_VaneT_Ti,CWM-CWS03::PID_VaneT_Td,CWM-CWS03::PID_VaneDP_DP-S,CWM-CWS03::FreqDetuned,CWM-CWS03::PID_VaneDP_Kp,CWM-CWS03::PID_VaneDP_Ti,CWM-CWS03::PID_VaneDP_Td",
 				"use_thingproxy": false,
 				"refresh": 10,
 				"method": "GET"
diff --git a/WebSites/rfq_skid_status/dashboard.json b/WebSites/rfq_skid_status/dashboard.json
index 7e42a4c30b903954f5e7d1e9ff72d88cc58d4f78..1a9252615bfcead228018331f5f31aa04d987906 100644
--- a/WebSites/rfq_skid_status/dashboard.json
+++ b/WebSites/rfq_skid_status/dashboard.json
@@ -53,7 +53,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "Skid Ready",
-						"value": "2-datasources[\"RFQ\"][\"CWM-CWS03::SKID_Ok\"][\"value\"]*2",
+						"value": "2-datasources[\"RFQ\"][\"CWM-CWS03::SKID_Ok\"][\"value\"][\"index\"]*2",
 						"green_text": "Ready",
 						"red_text": "Not Ready"
 					}
@@ -83,7 +83,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "Coupler 1 Loop",
-						"value": "2-datasources[\"RFQ\"][\"RFQ-010:WtrC-FS-011:Status\"][\"value\"]*2",
+						"value": "2-datasources[\"RFQ\"][\"RFQ-010:WtrC-FS-011:Status\"][\"value\"][\"index\"]*2",
 						"green_text": "Ready",
 						"red_text": "Not Ready"
 					}
@@ -92,7 +92,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "Coupler 1 Ceramic",
-						"value": "2-datasources[\"RFQ\"][\"RFQ-010:WtrC-FS-012:Status\"][\"value\"]*2",
+						"value": "2-datasources[\"RFQ\"][\"RFQ-010:WtrC-FS-012:Status\"][\"value\"][\"index\"]*2",
 						"green_text": "Ready",
 						"red_text": "Not Ready"
 					}
@@ -101,7 +101,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "Coupler 2 Loop",
-						"value": "2-datasources[\"RFQ\"][\"RFQ-010:WtrC-FS-021:Status\"][\"value\"]*2",
+						"value": "2-datasources[\"RFQ\"][\"RFQ-010:WtrC-FS-021:Status\"][\"value\"][\"index\"]*2",
 						"green_text": "Ready",
 						"red_text": "Not Ready"
 					}
@@ -110,7 +110,7 @@
 					"type": "ragIndicator",
 					"settings": {
 						"title": "Coupler 2 Ceramic",
-						"value": "2-datasources[\"RFQ\"][\"RFQ-010:WtrC-FS-022:Status\"][\"value\"]*2",
+						"value": "2-datasources[\"RFQ\"][\"RFQ-010:WtrC-FS-022:Status\"][\"value\"][\"index\"]*2",
 						"green_text": "Ready",
 						"red_text": "Not Ready"
 					}
@@ -140,7 +140,7 @@
 					"type": "text_widget",
 					"settings": {
 						"size": "regular",
-						"value": "status = datasources[\"RFQ\"][\"CWM-CWS03::VaneLoopStartTH\"][\"value\"]\nif (status == 0){\n\treturn \"Temperature\"\n}\nif (status == 1){\n    return \"Phase\"\n}",
+						"value": "status = datasources[\"RFQ\"][\"CWM-CWS03::VaneLoopStartTH\"][\"value\"][\"index\"]\nif (status == 0){\n\treturn \"Temperature\"\n}\nif (status == 1){\n    return \"Phase\"\n}",
 						"animate": true
 					}
 				}
@@ -152,7 +152,7 @@
 			"name": "RFQ",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/CWM-CWS03::SKID_Ok,RFQ-010:WtrC-FS-011:Status,RFQ-010:WtrC-FS-012:Status,RFQ-010:WtrC-FS-021:Status,RFQ-010:WtrC-FS-022:Status,CWM-CWS03::VaneLoopStartTH",
+				"url": "/data/api/v2/pvget/CWM-CWS03::SKID_Ok,RFQ-010:WtrC-FS-011:Status,RFQ-010:WtrC-FS-012:Status,RFQ-010:WtrC-FS-021:Status,RFQ-010:WtrC-FS-022:Status,CWM-CWS03::VaneLoopStartTH",
 				"use_thingproxy": false,
 				"refresh": 10,
 				"method": "GET",
diff --git a/WebSites/ts2_cav/dashboard.json b/WebSites/ts2_cav/dashboard.json
index 0cace0143e3efa3a0f3ac5fd6c96a2d569eec0f5..2484da5bc9929eb3954d6de4b1059f11956918d5 100644
--- a/WebSites/ts2_cav/dashboard.json
+++ b/WebSites/ts2_cav/dashboard.json
@@ -342,7 +342,7 @@
 			"name": "TS2",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/TS2-010CRM:Cryo-TE-010:MeasValue,TS2-010CRM:Cryo-TE-012:MeasValue,TS2-010CRM:Cryo-TE-013:MeasValue,TS2-010CRM:Cryo-TE-014:MeasValue,TS2-010CRM:Cryo-TE-015:MeasValue,TS2-010CRM:Cryo-TE-018:MeasValue,TS2-010CRM:Cryo-TE-019:MeasValue,TS2-010CRM:Cryo-TE-020:MeasValue,TS2-010CRM:Cryo-TE-023:MeasValue,TS2-010CRM:Cryo-TE-024:MeasValue,TS2-010CRM:Cryo-TE-025:MeasValue,TS2-010CRM:Cryo-TE-029:MeasValue,TS2-010CRM:Cryo-TE-030:MeasValue,TS2-010CRM:Cryo-TE-033:MeasValue,TS2-010CRM:Cryo-TE-034:MeasValue,TS2-010CRM:Cryo-TE-035:MeasValue,TS2-010CRM:Cryo-TE-039:MeasValue,TS2-010CRM:Cryo-TE-043:MeasValue,TS2-010CRM:Cryo-TE-044:MeasValue,TS2-010CRM:Cryo-TE-045:MeasValue,TS2-010CRM:Cryo-TE-049:MeasValue",
+				"url": "/data/api/v2/pvget/TS2-010CRM:Cryo-TE-010:MeasValue,TS2-010CRM:Cryo-TE-012:MeasValue,TS2-010CRM:Cryo-TE-013:MeasValue,TS2-010CRM:Cryo-TE-014:MeasValue,TS2-010CRM:Cryo-TE-015:MeasValue,TS2-010CRM:Cryo-TE-018:MeasValue,TS2-010CRM:Cryo-TE-019:MeasValue,TS2-010CRM:Cryo-TE-020:MeasValue,TS2-010CRM:Cryo-TE-023:MeasValue,TS2-010CRM:Cryo-TE-024:MeasValue,TS2-010CRM:Cryo-TE-025:MeasValue,TS2-010CRM:Cryo-TE-029:MeasValue,TS2-010CRM:Cryo-TE-030:MeasValue,TS2-010CRM:Cryo-TE-033:MeasValue,TS2-010CRM:Cryo-TE-034:MeasValue,TS2-010CRM:Cryo-TE-035:MeasValue,TS2-010CRM:Cryo-TE-039:MeasValue,TS2-010CRM:Cryo-TE-043:MeasValue,TS2-010CRM:Cryo-TE-044:MeasValue,TS2-010CRM:Cryo-TE-045:MeasValue,TS2-010CRM:Cryo-TE-049:MeasValue",
 				"use_thingproxy": false,
 				"refresh": 5,
 				"method": "GET"
diff --git a/WebSites/ts2_helevpres/dashboard.json b/WebSites/ts2_helevpres/dashboard.json
index 020de7c40978aa8da9c5b0942952cf031b329aa7..218574d0c4bfd465177857cb6064e15e9aa9d24d 100644
--- a/WebSites/ts2_helevpres/dashboard.json
+++ b/WebSites/ts2_helevpres/dashboard.json
@@ -189,7 +189,7 @@
 			"name": "TS2",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/TS2-010CRM:Cryo-PT-003:MeasValue,TS2-010CRM:Cryo-PT-004:MeasValue",
+				"url": "/data/api/v2/pvget/TS2-010CRM:Cryo-PT-003:MeasValue,TS2-010CRM:Cryo-PT-004:MeasValue",
 				"use_thingproxy": false,
 				"refresh": 5,
 				"method": "GET"
@@ -252,7 +252,8 @@
 				"url": "/data/api/v1/archiver/TS2-010CRM:Cryo-LT-001:MeasValue,TS2-010CRM:Cryo-LT-002:MeasValue/3600/100/freeboard",
 				"use_thingproxy": false,
 				"refresh": 5,
-				"method": "GET"
+				"method": "GET",
+				"name": "live"
 			}
 		}
 	],
diff --git a/WebSites/ts2_tpcircuits/dashboard.json b/WebSites/ts2_tpcircuits/dashboard.json
index 970b712f98c08cd94d56e8728a479192c8257d74..a08985f23e1af87ca0dc98e7848dd8273d1e2f40 100644
--- a/WebSites/ts2_tpcircuits/dashboard.json
+++ b/WebSites/ts2_tpcircuits/dashboard.json
@@ -173,7 +173,7 @@
 			"name": "TS2",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/TS2-010CRM:Cryo-LT-001:MeasValue,TS2-010CRM:Cryo-LT-002:MeasValue,TS2-010CRM:Cryo-TE-010:MeasValue,TS2-010CRM:Cryo-TE-020:MeasValue,TS2-010CRM:Cryo-TE-030:MeasValue,TS2-010CRM:Cryo-TE-002:MeasValue,TS2-010CRM:Cryo-TE-093:MeasValue,TS2-010CRM:Cryo-PT-004:MeasValue,TS2-010CRM:Cryo-PT-003:MeasValue,TS2-010CRM:Cryo-TE-091:MeasValue,TS2-010CRM:Cryo-TE-092:MeasValue,TS2-010CRM:Cryo-TE-094:MeasValue,TS2-010CDL:Cryo-PT-82301:MeasValue,TS2-010CRM:Cryo-TE-001:MeasValue",
+				"url": "/data/api/v2/pvget/TS2-010CRM:Cryo-LT-001:MeasValue,TS2-010CRM:Cryo-LT-002:MeasValue,TS2-010CRM:Cryo-TE-010:MeasValue,TS2-010CRM:Cryo-TE-020:MeasValue,TS2-010CRM:Cryo-TE-030:MeasValue,TS2-010CRM:Cryo-TE-002:MeasValue,TS2-010CRM:Cryo-TE-093:MeasValue,TS2-010CRM:Cryo-PT-004:MeasValue,TS2-010CRM:Cryo-PT-003:MeasValue,TS2-010CRM:Cryo-TE-091:MeasValue,TS2-010CRM:Cryo-TE-092:MeasValue,TS2-010CRM:Cryo-TE-094:MeasValue,TS2-010CDL:Cryo-PT-82301:MeasValue,TS2-010CRM:Cryo-TE-001:MeasValue",
 				"use_thingproxy": false,
 				"refresh": 5,
 				"method": "GET"
diff --git a/default.conf b/default.conf
index 3823c1b6d411428ec4ab9873f1a0326730145c10..6f762988f5d4db829e8214445d36715f4e31f9cb 100644
--- a/default.conf
+++ b/default.conf
@@ -20,7 +20,7 @@ server {
         root   /usr/share/nginx/web/pos;
     }
 
-    location ~ ^/(menu|pvs|pss_permits|instruments|ts2_cav|ts2_screens|ts2_tpcircuits|ts2_helevpres|odh|mcu|rfq_cooling|rfq_skid_status|rfq_skid_exchangervane|rfq_skid_body|dev) {
+    location ~ ^/(menu|pvs|pss_permits|instruments|ts2_cav|ts2_screens|ts2_tpcircuits|ts2_helevpres|odh|rfq_cooling|rfq_skid_status|rfq_skid_exchangervane|rfq_skid_body|dev) {
         root   /usr/share/nginx/web;
     }