diff --git a/.github/workflows/code_analysis.yml b/.github/workflows/code_analysis.yml
index e36a2f2f..57faee90 100644
--- a/.github/workflows/code_analysis.yml
+++ b/.github/workflows/code_analysis.yml
@@ -86,5 +86,4 @@ jobs:
         pip install --upgrade pip
         pip install -r requirements-dev/requirements-prospector.txt -r dashboard_viewer/requirements.txt
     - name: prospector
-      run: |
-        prospector dashboard_viewer
+      run: DJANGO_SETTINGS_MODULE=dashboard_viewer.settings prospector dashboard_viewer
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index decab2c3..289d0527 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -39,4 +39,4 @@ jobs:
         export $(grep -v '^#' tests/.env | xargs -d '\n')
         cd dashboard_viewer
         python manage.py test --exclude-tag third-party-app
-        SINGLE_APPLICATION_MODE=n MAIN_APPLICATION_HOST=mainapp.host.com python manage.py test --tag third-party-app
+        #SINGLE_APPLICATION_MODE=n MAIN_APPLICATION_HOST=mainapp.host.com python manage.py test --tag third-party-app
diff --git a/.gitignore b/.gitignore
index c3bd3f72..84add08f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,15 @@
 # documentation temporary files
 docs/src/_book
 
-# dashboard_viewer django app ERRORs logs
-logs
-
 # custom file created at docker/superset
 docker-init.sh
 
 # Docker volumes
 volumes/
 
+# backups configurations
+backups.conf
+
 # Retrived from https://github.com/github/gitignore/blob/21419e391a78f2487340b3b1240b988aaf15b54f/Node.gitignore
 # Logs
 logs
diff --git a/backups/backup.sh b/backups/backup.sh
index 026343c4..abdb87cb 100755
--- a/backups/backup.sh
+++ b/backups/backup.sh
@@ -8,9 +8,9 @@ echo_step() {
 
 set -e
 
-. $HOME/.dashboards_backups.conf
+. "$(dirname "$0")/backups.conf"
 
-if [ $RUN -eq 0 ] ; then
+if [ "$RUN" -eq 0 ] ; then
     echo "run was 0. exitting"
     exit 0
 fi
@@ -19,13 +19,13 @@ echo_step "1" "Create temporary directory"
 BACKUP_DIRECTORY_NAME=dashboards_backups_$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 40)
 TMP_BACKUP_DIRECTORY=$TMP_DIRECTORY/$BACKUP_DIRECTORY_NAME
 
-mkdir $TMP_BACKUP_DIRECTORY
+mkdir "$TMP_BACKUP_DIRECTORY"
 EXIT_STATUS=0
 
 (
     echo_step "2" "Get into the docker directory"
     PREVIOUS_PWD=$(pwd)
-    cd $(dirname "$0")
+    cd "$(dirname "$0")"
     (
         cd ../docker
 
@@ -45,7 +45,7 @@ EXIT_STATUS=0
 
         REDIS_CONTAINER_ID=$(docker-compose ps -q redis)
 
-        docker cp -a $REDIS_CONTAINER_ID:/data/dump.rdb $TMP_BACKUP_DIRECTORY/redis.rdb
+        docker cp -a $REDIS_CONTAINER_ID:/data/dump.rdb "$TMP_BACKUP_DIRECTORY/redis.rdb"
 
         echo_step "5" "Extract Dashboards's media files"
         MEDIA_ROOT=$(docker-compose exec -T dashboard sh -c """
@@ -63,28 +63,28 @@ print(settings.MEDIA_ROOT, end=\"\")
 
         # copy media files to backup folder
         DASHBOARDS_CONTAINER_ID=$(docker-compose ps -q dashboard)
-        docker cp -a $DASHBOARDS_CONTAINER_ID:$MEDIA_ROOT $TMP_BACKUP_DIRECTORY
+        docker cp -a $DASHBOARDS_CONTAINER_ID:$MEDIA_ROOT "$TMP_BACKUP_DIRECTORY"
 
         echo_step "6" "Compress gathered data"
         COMPRESSED_FILE_PATH=$TMP_DIRECTORY/${APP_NAME}_$(date +"%Y%m%d%H%M%S").zip
         (
-            cd $TMP_DIRECTORY
-            zip -q -r $COMPRESSED_FILE_PATH $BACKUP_DIRECTORY_NAME
-            #tar -C $TMP_DIRECTORY -cJf $COMPRESSED_FILE_PATH $BACKUP_DIRECTORY_NAME
+            cd "$TMP_DIRECTORY"
+            zip -q -r "$COMPRESSED_FILE_PATH" $BACKUP_DIRECTORY_NAME
+            #tar -C "$TMP_DIRECTORY" -cJf "$COMPRESSED_FILE_PATH" $BACKUP_DIRECTORY_NAME
 
             echo_step "7" "Send to $SERVER"
-            backup_uploader $APP_NAME $SERVER $CREDENTIALS_FILE_PATH $BACKUP_CHAIN_CONFIG $COMPRESSED_FILE_PATH
+            backup_uploader "$APP_NAME" "$SERVER" "$CREDENTIALS_FILE_PATH" "$BACKUP_CHAIN_CONFIG" "$COMPRESSED_FILE_PATH"
         ) || EXIT_STATUS=$?
-        rm -f $COMPRESSED_FILE_PATH
+        rm -f "$COMPRESSED_FILE_PATH"
 
         exit $EXIT_STATUS
     ) || EXIT_STATUS=$?
-    cd $PREVIOUS_PWD
+    cd "$PREVIOUS_PWD"
 
     exit $EXIT_STATUS
 ) || EXIT_STATUS=$?
 
-rm -rf $TMP_BACKUP_DIRECTORY
+rm -rf "$TMP_BACKUP_DIRECTORY"
 
 if [ $EXIT_STATUS -ne 0 ] ; then
     echo "Failed with exit code $EXIT_STATUS"
diff --git a/backups/dashboards_backups.conf.example b/backups/backups.conf.example
similarity index 100%
rename from backups/dashboards_backups.conf.example
rename to backups/backups.conf.example
diff --git a/backups/restore.sh b/backups/restore.sh
new file mode 100755
index 00000000..28e0332d
--- /dev/null
+++ b/backups/restore.sh
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+set -e
+
+if [ $# -ne 1 ] ; then
+  1>&2 echo "Usage: restore.sh [zip backup file]"
+  exit 1
+fi
+
+STEP_COUNT=5
+
+echo_step() {
+  printf "%3s/%s %s\n" "$1" "$STEP_COUNT" "$2"
+}
+
+. "$(dirname "$0")/backups.conf"
+
+echo_step 1 "Extracting backup file"
+
+BACKUP_ROOT_DIRECTORY=$(unzip -qql "$1" | head -n1 | sed -r '1 {s/([ ]+[^ ]+){3}\s+//;q}')
+unzip "$1" -d "$TMP_DIRECTORY" >/dev/null
+BACKUP_ROOT_DIRECTORY="$TMP_DIRECTORY/$BACKUP_ROOT_DIRECTORY"
+
+EXIT_STATUS=0
+
+(
+  echo_step 2 "Get into the docker directory"
+  PREVIOUS_PWD=$(pwd)
+  cd "$(dirname "$0")"
+  (
+    cd ../docker
+
+    echo_step 3 "Restoring postgres"
+    docker-compose stop dashboard dashboard_worker superset superset-worker superset-worker-beat >/dev/null 2>&1
+    docker-compose up -d postgres >/dev/null 2>&1
+
+    until docker-compose exec -T postgres sh -c "pg_isready" >/dev/null 2>&1 ; do
+        sleep 2
+    done
+
+    CONTAINER_ID=$(docker-compose ps -q postgres)
+    docker cp "$BACKUP_ROOT_DIRECTORY/postgres.sql" $CONTAINER_ID:/tmp
+    docker-compose exec -T postgres sh -c """
+psql -f /tmp/postgres.sql -U \$POSTGRES_USER -d postgres
+rm /tmp/postgres.sql
+"""
+
+    echo_step 4 "Restoring redis"
+    docker-compose up -d redis >/dev/null 2>&1
+    CONTAINER_ID=$(docker-compose ps -q redis)
+    docker cp "$BACKUP_ROOT_DIRECTORY/redis.rdb" $CONTAINER_ID:/
+    docker-compose exec -T redis sh -c """
+mv /redis.rdb /data
+"""
+    docker-compose restart redis >/dev/null 2>&1
+
+    echo_step 5 "Restoring Dashboards' media files"
+    docker-compose up -d dashboard >/dev/null 2>&1
+    MEDIA_ROOT=$(docker-compose exec -T dashboard sh -c """
+echo '''from django.conf import settings
+print(settings.MEDIA_ROOT, end=\"\")
+''' | python manage.py shell 2>/dev/null""")
+
+    # fix MEDIA_ROOT if a relative path is returned
+    case $MEDIA_ROOT in
+        "/"*) ;;
+        *)
+            MEDIA_ROOT="/app/$MEDIA_ROOT"
+        ;;
+    esac
+
+    CONTAINER_ID=$(docker-compose ps -q dashboard)
+
+    docker-compose exec -T dashboard sh -c """
+cd $MEDIA_ROOT
+find . -mindepth 1 -maxdepth 1 -exec rm -r {} +
+"""
+    docker cp -a "$BACKUP_ROOT_DIRECTORY/$(basename "$MEDIA_ROOT")" $CONTAINER_ID:"$MEDIA_ROOT"
+    docker-compose exec -T dashboard sh -c """
+cd $MEDIA_ROOT
+find $(basename "$MEDIA_ROOT") -mindepth 1 -maxdepth 1 -exec mv -t . -- {} +
+rmdir $(basename "$MEDIA_ROOT")
+"""
+
+    docker-compose up -d
+  ) || EXIT_STATUS=$?
+  cd "$PREVIOUS_PWD"
+
+  exit $EXIT_STATUS
+) || EXIT_STATUS=$?
+rm -rf "$BACKUP_ROOT_DIRECTORY"
+
+if [ $EXIT_STATUS -ne 0 ] ;then
+    echo "Failed with exit code $EXIT_STATUS"
+    exit $EXIT_STATUS
+fi
diff --git a/dashboard_viewer/dashboard_viewer/settings.py b/dashboard_viewer/dashboard_viewer/settings.py
index d1a60a76..2ebac98e 100644
--- a/dashboard_viewer/dashboard_viewer/settings.py
+++ b/dashboard_viewer/dashboard_viewer/settings.py
@@ -9,8 +9,9 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/2.2/ref/settings/
 """
-
+import logging
 import os
+from collections import OrderedDict
 from distutils.util import strtobool
 
 from constance.signals import config_updated
@@ -24,43 +25,43 @@
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
 
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ["SECRET_KEY"]
-
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.environ.get("DASHBOARD_VIEWER_ENV", "development") == "development"
 
 
-_LOGS_DIR = os.path.join(BASE_DIR, "logs")
-if not os.path.exists(_LOGS_DIR):
-    os.makedirs(_LOGS_DIR, exist_ok=True)
-elif not os.path.isdir(_LOGS_DIR):
-    raise TypeError('file "logs" is not a directory.')
-
 LOGGING = {
     "version": 1,
-    "filters": {
-        "require_debug_true": {
-            "()": "django.utils.log.RequireDebugTrue",
+    "disable_existing_loggers": False,
+    "formatters": {
+        "custom": {
+            "format": "%(asctime)s %(levelname)s %(name)s:%(lineno)s %(message)s",
         },
     },
     "handlers": {
-        "file": {
-            "level": "ERROR",
-            "filters": ["require_debug_true"],
-            "class": "logging.FileHandler",
-            "filename": os.path.join(_LOGS_DIR, "errors.log"),
-        }
+        "console": {
+            "class": "logging.StreamHandler",
+            "formatter": "custom",
+        },
     },
     "loggers": {
-        "django": {
-            "handlers": ["file"],
-            "level": "ERROR",
-            "propagate": True,
+        "root": {
+            "handlers": ["console"],
+            "level": "DEBUG" if DEBUG else "INFO",
         },
     },
 }
 
+
+_DEFAULT_SECRET_KEY = "CHANGE_ME"  # noqa
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = os.environ.get("SECRET_KEY", _DEFAULT_SECRET_KEY)
+if not DEBUG and SECRET_KEY == _DEFAULT_SECRET_KEY:
+    logging.getLogger(__name__).warning(
+        "Using the default secret key. If this is a production environment please change it.",
+    )
+
+
 ALLOWED_HOSTS = ["*"]
 
 
@@ -275,6 +276,21 @@
         "If a Data Source owner can change the draft status when editing its details",
         bool,
     ),
+    "SUPERSET_HOST": (
+        "https://superset.ehden.eu",
+        "Host of the target superset installation. Used to redirect to the dashboard of a database",
+        str,
+    ),
+    "DATABASE_DASHBOARD_IDENTIFIER": (
+        "database-level-dashboard",
+        "Identifier of the database dashboard on the Superset installation.",
+        str,
+    ),
+    "DATABASE_FILTER_ID": (
+        69,
+        "Id of the database filter present in the Database Dashboard",
+        int,
+    ),
     "TABS_LOGO_CONTAINER_CSS": (
         "padding: 5px 5px 5px 5px;\nheight: 100px;\nmargin-bottom: 10px;\n",
         "Css for the div container of the logo image",
@@ -295,6 +311,26 @@
     ),
 }
 
+CONSTANCE_CONFIG_FIELDSETS = OrderedDict(
+    [
+        ("Application Attributes", ("APP_LOGO_IMAGE", "APP_LOGO_URL", "APP_TITLE")),
+        (
+            "Uploader Texts",
+            (
+                "UPLOADER_EXECUTE_EXPORT_PACKAGE",
+                "UPLOADER_UPLOAD",
+                "UPLOADER_AUTO_UPDATE",
+            ),
+        ),
+        ("Uploader Settings", ("UPLOADER_ALLOW_EDIT_DRAFT_STATUS",)),
+        (
+            "Superset",
+            ("SUPERSET_HOST", "DATABASE_DASHBOARD_IDENTIFIER", "DATABASE_FILTER_ID"),
+        ),
+        ("Tabs (Deprecated)", ("TABS_LOGO_CONTAINER_CSS", "TABS_LOGO_IMG_CSS")),
+    ]
+)
+
 
 @receiver(config_updated)
 def constance_updated(key, old_value, **_):
diff --git a/dashboard_viewer/dashboard_viewer/urls.py b/dashboard_viewer/dashboard_viewer/urls.py
index 38b022f1..8315b5bf 100644
--- a/dashboard_viewer/dashboard_viewer/urls.py
+++ b/dashboard_viewer/dashboard_viewer/urls.py
@@ -39,7 +39,7 @@
     path("martor/", include("martor.urls")),
     path("uploader/", include("uploader.urls")),
     re_path(
-        fr'^{re.escape(settings.MEDIA_URL.lstrip("/"))}(?P<path>.*)$',
+        rf'^{re.escape(settings.MEDIA_URL.lstrip("/"))}(?P<path>.*)$',
         serve,
         kwargs={"document_root": settings.MEDIA_ROOT},
     )
diff --git a/dashboard_viewer/docker-entrypoint.sh b/dashboard_viewer/docker-entrypoint.sh
index b20c7430..8f619da0 100755
--- a/dashboard_viewer/docker-entrypoint.sh
+++ b/dashboard_viewer/docker-entrypoint.sh
@@ -9,7 +9,7 @@ python manage.py compilescss
 python manage.py collectstatic --noinput --ignore="*.scss"
 
 if [ "${DASHBOARD_VIEWER_ENV}" = "production" ]; then
-    exec gunicorn dashboard_viewer.wsgi:application --bind 0.0.0.0:8000 --workers 5
+    exec gunicorn dashboard_viewer.wsgi:application --bind 0.0.0.0:8000 --workers 1 --worker-class gthread --thread 16
 else
     python manage.py runserver 0.0.0.0:8000
 fi
diff --git a/dashboard_viewer/materialized_queries_manager/management/commands/refresh_mat_views.py b/dashboard_viewer/materialized_queries_manager/management/commands/refresh_mat_views.py
index 53ca5148..c3b497a6 100644
--- a/dashboard_viewer/materialized_queries_manager/management/commands/refresh_mat_views.py
+++ b/dashboard_viewer/materialized_queries_manager/management/commands/refresh_mat_views.py
@@ -2,6 +2,7 @@
 
 from django.core.cache import cache
 from django.core.management.base import BaseCommand
+
 from materialized_queries_manager.utils import refresh
 
 logger = logging.getLogger(__name__)
diff --git a/dashboard_viewer/materialized_queries_manager/tasks.py b/dashboard_viewer/materialized_queries_manager/tasks.py
index a8f5e937..aed85222 100644
--- a/dashboard_viewer/materialized_queries_manager/tasks.py
+++ b/dashboard_viewer/materialized_queries_manager/tasks.py
@@ -9,6 +9,7 @@
 from django.core import serializers
 from django.core.cache import cache
 from django.db import connections, ProgrammingError, router, transaction
+
 from materialized_queries_manager.models import MaterializedQuery
 from materialized_queries_manager.utils import refresh
 
diff --git a/dashboard_viewer/materialized_queries_manager/utils.py b/dashboard_viewer/materialized_queries_manager/utils.py
index c8509d12..857ea4e7 100644
--- a/dashboard_viewer/materialized_queries_manager/utils.py
+++ b/dashboard_viewer/materialized_queries_manager/utils.py
@@ -1,8 +1,9 @@
 from django.core.cache import cache
 from django.db import connections
-from materialized_queries_manager.models import MaterializedQuery
 from redis_rw_lock import RWLock
 
+from materialized_queries_manager.models import MaterializedQuery
+
 
 def refresh(logger, db_id=None, query_set=None):
     # Only one worker can update the materialized views at the same time -> same as -> only one thread
diff --git a/dashboard_viewer/requirements.in b/dashboard_viewer/requirements.in
index 4192af15..e8fd2b76 100644
--- a/dashboard_viewer/requirements.in
+++ b/dashboard_viewer/requirements.in
@@ -8,13 +8,13 @@ django-markdownify==0.9.0                 # markdown to html
 django-model-utils==4.2.0                 # get specific type of subclasses after requesting buttons on tabsManager app
 django-sass-processor==1.1                # automate scss devolopment
 django-redis==5.1.0                       # acess redis through a programmatic API
-django==3.2.10
+django==3.2.13
 djangorestframework==3.13.1               # expose tabs content through an API
 libsass==0.21.0                           # to compile scss files into css
 gunicorn==20.1.0                          # for production deployment
 martor==1.6.7                             # markdown editor in admin app
 pandas==1.3.5                             # to handle achilles results files and their data
-Pillow==8.4.0                             # image fields (App Logo)
+Pillow==9.0.1                             # image fields (App Logo)
 psycopg2-binary==2.9.2                    # communicate with postgres
 redis==3.5.3                              # comunicate with redis (celery)
 git+https://github.com/bioinformatics-ua/redis-rw-lock.git#egg=redis-rw-lock
diff --git a/dashboard_viewer/requirements.txt b/dashboard_viewer/requirements.txt
index ed0067b9..07a87d53 100644
--- a/dashboard_viewer/requirements.txt
+++ b/dashboard_viewer/requirements.txt
@@ -34,7 +34,7 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.2.0
     # via celery
-django==3.2.10
+django==3.2.13
     # via
     #   -r requirements.in
     #   django-appconf
@@ -73,6 +73,10 @@ gunicorn==20.1.0
     # via -r requirements.in
 idna==3.3
     # via requests
+importlib-metadata==4.11.4
+    # via
+    #   markdown
+    #   martor
 kombu==5.2.2
     # via celery
 libsass==0.21.0
@@ -89,7 +93,7 @@ packaging==21.3
     # via bleach
 pandas==1.3.5
     # via -r requirements.in
-pillow==8.4.0
+pillow==9.0.1
     # via -r requirements.in
 prompt-toolkit==3.0.24
     # via click-repl
@@ -145,6 +149,8 @@ wcwidth==0.2.5
     # via prompt-toolkit
 webencodings==0.5.1
     # via bleach
+zipp==3.8.0
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/dashboard_viewer/uploader/admin.py b/dashboard_viewer/uploader/admin.py
index 9a71fdc4..50056310 100644
--- a/dashboard_viewer/uploader/admin.py
+++ b/dashboard_viewer/uploader/admin.py
@@ -46,7 +46,8 @@ def has_change_permission(self, request, obj=None):
 
 @admin.register(DataSource)
 class DataSourceAdmin(admin.ModelAdmin):
-    list_display = ("name", "acronym", "database_type", "country")
+    list_display = ("acronym", "name", "draft", "database_type", "country")
+    list_filter = ("draft",)
 
     actions = [custom_delete_selected]
 
diff --git a/dashboard_viewer/uploader/file_handler/checks.py b/dashboard_viewer/uploader/file_handler/checks.py
index 42fe57f3..c19556da 100644
--- a/dashboard_viewer/uploader/file_handler/checks.py
+++ b/dashboard_viewer/uploader/file_handler/checks.py
@@ -9,6 +9,10 @@ class FileChecksException(Exception):
     pass
 
 
+class InvalidCSVFile(FileChecksException):
+    pass
+
+
 class InvalidFileFormat(FileChecksException):
     pass
 
@@ -25,6 +29,78 @@ class MissingFieldValue(FileChecksException):
     pass
 
 
+def _generate_file_reader(uploaded_file):
+    """
+    Receives a python file pointer and returns a pandas csv file reader, along with the columns
+     present in the file
+    :param uploaded_file: python file pointer of the uploaded file
+    """
+    columns = [
+        "analysis_id",
+        "stratum_1",
+        "stratum_2",
+        "stratum_3",
+        "stratum_4",
+        "stratum_5",
+        "count_value",
+    ]
+
+    wrapper = io.TextIOWrapper(uploaded_file)
+    csv_reader = csv.reader(wrapper)
+
+    try:
+        first_row = next(csv_reader)
+    except:  # noqa
+        raise InvalidCSVFile(
+            "There was an error parsing the provided file. "
+            "Uploaded files must be comma-separated values (CSV) files. "
+            "If you think this is an error, please contact the system administrator."
+        )
+
+    wrapper.detach()
+
+    if len(first_row) == 16:
+        columns.extend(
+            (
+                "min_value",
+                "max_value",
+                "avg_value",
+                "stdev_value",
+                "median_value",
+                "p10_value",
+                "p25_value",
+                "p75_value",
+                "p90_value",
+            )
+        )
+    elif len(first_row) != 7:
+        raise InvalidFileFormat(
+            "The provided file has an invalid number of columns. "
+            "Make sure you uploaded a valid comma-separated values (CSV) file."
+        )
+
+    uploaded_file.seek(0)
+
+    try:
+        file_reader = pandas.read_csv(
+            uploaded_file,
+            header=0,
+            dtype=str,
+            skip_blank_lines=False,
+            index_col=False,
+            names=columns,
+            chunksize=100,
+        )
+    except:  # noqa
+        raise InvalidCSVFile(
+            "There was an error parsing the provided file. "
+            "Uploaded files must be comma-separated values (CSV) files. "
+            "If you think this is an error, please contact the system administrator."
+        )
+    else:
+        return file_reader, columns
+
+
 def _check_correct(names, values, check, transform=None):
     """
     Transforms the values of given fields from the uploaded file
@@ -62,50 +138,7 @@ def _check_correct(names, values, check, transform=None):
 
 
 def extract_data_from_uploaded_file(uploaded_file):
-    columns = [
-        "analysis_id",
-        "stratum_1",
-        "stratum_2",
-        "stratum_3",
-        "stratum_4",
-        "stratum_5",
-        "count_value",
-    ]
-
-    wrapper = io.TextIOWrapper(uploaded_file)
-    csv_reader = csv.reader(wrapper)
-
-    first_row = next(csv_reader)
-    wrapper.detach()
-
-    if len(first_row) == 16:
-        columns.extend(
-            (
-                "min_value",
-                "max_value",
-                "avg_value",
-                "stdev_value",
-                "median_value",
-                "p10_value",
-                "p25_value",
-                "p75_value",
-                "p90_value",
-            )
-        )
-    elif len(first_row) != 7:
-        raise InvalidFileFormat("The provided file has an invalid number of columns.")
-
-    uploaded_file.seek(0)
-
-    file_reader = pandas.read_csv(
-        uploaded_file,
-        header=0,
-        dtype=str,
-        skip_blank_lines=False,
-        index_col=False,
-        names=columns,
-        chunksize=100,
-    )
+    file_reader, columns = _generate_file_reader(uploaded_file)
 
     types = {
         "analysis_id": numpy.int64,
@@ -144,6 +177,12 @@ def extract_data_from_uploaded_file(uploaded_file):
             )
         except StopIteration:
             break
+        except:  # noqa
+            raise InvalidCSVFile(
+                "There was an error parsing the provided file. "
+                "Uploaded files must be comma-separated values (CSV) files. "
+                "If you think this is an error, please contact the system administrator."
+            )
 
         if chunk[["analysis_id", "count_value"]].isna().values.any():
             raise InvalidFieldValue(
diff --git a/dashboard_viewer/uploader/file_handler/updates.py b/dashboard_viewer/uploader/file_handler/updates.py
index df0ed447..d14ba639 100644
--- a/dashboard_viewer/uploader/file_handler/updates.py
+++ b/dashboard_viewer/uploader/file_handler/updates.py
@@ -2,6 +2,7 @@
 from django.conf import settings
 from django.db import connections
 from sqlalchemy import create_engine
+
 from uploader.models import (
     AchillesResults,
     AchillesResultsArchive,
diff --git a/dashboard_viewer/uploader/tasks.py b/dashboard_viewer/uploader/tasks.py
index 87e5dd6a..8e8e898f 100644
--- a/dashboard_viewer/uploader/tasks.py
+++ b/dashboard_viewer/uploader/tasks.py
@@ -3,9 +3,9 @@
 from django.core import serializers
 from django.core.cache import cache
 from django.db import router, transaction
-from materialized_queries_manager.utils import refresh
 from redis_rw_lock import RWLock
 
+from materialized_queries_manager.utils import refresh
 from .file_handler.checks import extract_data_from_uploaded_file
 from .file_handler.updates import update_achilles_results_data
 from .models import AchillesResults, PendingUpload, UploadHistory
diff --git a/dashboard_viewer/uploader/templates/no_uploads_dashboard.html b/dashboard_viewer/uploader/templates/no_uploads_dashboard.html
new file mode 100644
index 00000000..eed08266
--- /dev/null
+++ b/dashboard_viewer/uploader/templates/no_uploads_dashboard.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Database Dashboard</title>
+
+  <style>
+    body {
+        text-align: center;
+    }
+    h4 {
+        line-height: 150%;
+        font-size: 18px;
+        font-family: Roboto, sans-serif;
+        font-weight: 500;
+    }
+  </style>
+</head>
+<body>
+  <h4>No data available: This database was not yet mapped into the CDM</h4>
+</body>
+</html>
\ No newline at end of file
diff --git a/dashboard_viewer/uploader/urls.py b/dashboard_viewer/uploader/urls.py
index 07dc9584..bf2236a1 100644
--- a/dashboard_viewer/uploader/urls.py
+++ b/dashboard_viewer/uploader/urls.py
@@ -18,4 +18,9 @@
         "<str:data_source>/upload/<int:upload_id>/status/", views.get_upload_task_status
     ),
     path("", views.create_data_source, name="create_data_source"),
+    path(
+        "<str:data_source>/dashboard/",
+        views.data_source_dashboard,
+        name="data_source_dashboard",
+    ),
 ]
diff --git a/dashboard_viewer/uploader/views.py b/dashboard_viewer/uploader/views.py
index 78ea20f3..584eba88 100644
--- a/dashboard_viewer/uploader/views.py
+++ b/dashboard_viewer/uploader/views.py
@@ -2,20 +2,21 @@
 
 import constance
 from django.contrib import messages
+from django.db import router, transaction
 from django.forms import fields
-from django.http import JsonResponse
+from django.http import HttpResponseRedirect, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.html import format_html, mark_safe
 from django.views.decorators.clickjacking import xframe_options_exempt
+from rest_framework import viewsets
 from rest_framework.response import Response
-from rest_framework.viewsets import GenericViewSet
 
-from materialized_queries_manager.tasks import refresh_materialized_views_task
 from materialized_queries_manager.models import MaterializedQuery
+from materialized_queries_manager.tasks import refresh_materialized_views_task
+from . import serializers
 from .decorators import uploader_decorator
 from .forms import AchillesResultsForm, EditSourceForm, SourceForm
 from .models import Country, DataSource, PendingUpload, UploadHistory
-from .serializers import DataSourceSerializer
 from .tasks import upload_results_file
 
 PAGE_TITLE = "Dashboard Data Upload"
@@ -291,23 +292,61 @@ def edit_data_source(request, *_, **kwargs):
     )
 
 
-class DataSourceUpdate(GenericViewSet):
-    # since the edit and upload views have not authentication, also disable
+@uploader_decorator
+@xframe_options_exempt
+def data_source_dashboard(request, data_source):
+    try:
+        data_source = DataSource.objects.get(hash=data_source)
+    except DataSource.DoesNotExist:
+        return render(request, "no_uploads_dashboard.html")
+
+    if data_source.uploadhistory_set.exists():
+        config = constance.config
+        return HttpResponseRedirect(
+            f"{config.SUPERSET_HOST}/superset/dashboard/{config.DATABASE_DASHBOARD_IDENTIFIER}/"
+            "?standalone=1"
+            f'&preselect_filters={{"{config.DATABASE_FILTER_ID}":{{"acronym":["{data_source.acronym}"]}}}}'
+        )
+
+    return render(request, "no_uploads_dashboard.html")
+
+
+class DataSourceUpdate(viewsets.GenericViewSet):
+    # since the edit and upload views don't have authentication, also disable
     #  authentication from this
     authentication_classes = ()
     permission_classes = ()
 
     lookup_field = "hash"
-    serializer_class = DataSourceSerializer
+    serializer_class = serializers.DataSourceSerializer
     queryset = DataSource.objects.all()
 
-    def partial_update(self, request, *_, **__):
-        instance = self.get_object()
-        serializer = self.get_serializer(instance, data=request.data, partial=True)
-        serializer.is_valid(raise_exception=True)
-        serializer.save()
+    def get_object_for_patch(self):
+        # here we get the query set with select_for_update so it lock updates on that record
+        queryset = self.filter_queryset(self.get_queryset().select_for_update())
+
+        assert (
+            self.lookup_field and not self.lookup_url_kwarg
+        ), "Expected lookup_field to be defined and not lookup_url_kwarg."
+
+        filter_kwargs = {self.lookup_field: self.kwargs[self.lookup_field]}
+        obj = get_object_or_404(queryset, **filter_kwargs)
 
-        refresh_materialized_views_task.delay([obj.matviewname for obj in MaterializedQuery.objects.all()])
+        # May raise a permission denied
+        self.check_object_permissions(self.request, obj)
+
+        return obj
+
+    def partial_update(self, request, *_, **__):
+        with transaction.atomic(using=router.db_for_write(DataSource)):
+            instance = self.get_object_for_patch()
+            serializer = self.get_serializer(instance, data=request.data, partial=True)
+            serializer.is_valid(raise_exception=True)
+            serializer.save()
+
+        refresh_materialized_views_task.delay(
+            [obj.matviewname for obj in MaterializedQuery.objects.all()],
+        )
 
         if getattr(instance, "_prefetched_objects_cache", None):
             # If 'prefetch_related' has been applied to a queryset, we need to
diff --git a/dashboard_viewer/utils/__init__.py b/dashboard_viewer/utils/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/dashboard_viewer/utils/fix_dates.py b/dashboard_viewer/utils/fix_dates.py
new file mode 100644
index 00000000..94790fa0
--- /dev/null
+++ b/dashboard_viewer/utils/fix_dates.py
@@ -0,0 +1,140 @@
+import datetime
+import re
+
+from django.db import transaction
+
+from uploader.models import AchillesResults
+
+MONTHS = dict(
+    map(
+        lambda t: (t[1], f"{t[0] + 1:02}"),
+        enumerate(
+            (
+                "JAN",
+                "FEV",
+                "MAR",
+                "APR",
+                "MAY",
+                "JUN",
+                "JUL",
+                "AUG",
+                "SEP",
+                "OCT",
+                "NOV",
+                "DEC",
+            )
+        ),
+    )
+)
+
+with_month = re.compile(r"(\d{2})-([A-Z]{3})-(\d{2})")  # 02-MAY-2020
+
+
+def with_month_extractor(match: re.Match):
+    day, month, year = match.groups()
+    return f"20{year}", MONTHS[month], day
+
+
+with_hiphen = re.compile(r"(\d{4})-(\d{2})-(\d{2})")  # 2020-12-02
+
+
+def with_hiphen_extractor(match: re.Match):
+    return match.groups()
+
+
+no_hiphen = re.compile(r"(\d{4})(\d{2})(\d{2})")  # 20201202
+no_hiphen_extractor = with_hiphen_extractor
+
+no_hiphen_float = re.compile(r"(\d{4})(\d{2})(\d{2})\.\d")  # 20201202.0
+no_hiphen_float_extractor = with_hiphen_extractor
+
+with_slash_one_digit = re.compile(
+    r"(\d{1,2})/(\d{1,2})/(\d{4})"
+)  # 1/31/2020 or 12/1/2020 or 1/1/2020 or 12/31/2020
+
+
+def with_slash_one_digit_extractor(match: re.Match):
+    month, day, year = match.groups()
+    return year, f"{int(month):02}", f"{int(day):02}"
+
+
+with_slash_two_digits = re.compile(
+    r"(\d{2})/(\d{2})/(\d{2,4})"
+)  # 31/01/20 or 31/01/2020
+
+
+def with_slash_two_digits_extractor(match: re.Match):
+    day, month, year = match.groups()
+    return ("" if len(year) == 4 else "20") + year, month, day
+
+
+PATTERNS = (
+    (with_month, with_month_extractor),
+    (with_hiphen, with_hiphen_extractor),
+    (no_hiphen, no_hiphen_extractor),
+    (no_hiphen_float, no_hiphen_float_extractor),
+    (
+        with_slash_two_digits,
+        with_slash_two_digits_extractor,
+    ),  # try first with two digits then with one
+    (with_slash_one_digit, with_slash_one_digit_extractor),
+)
+
+
+def _convert_value(valid_pattern: re.Pattern, value: str):
+    for pattern, extractor in PATTERNS:
+        if pattern == valid_pattern:
+            continue
+        match = pattern.fullmatch(value)
+        if match:
+            date_tuple = extractor(match)
+            try:
+                datetime.date(*map(int, date_tuple))
+            except ValueError:
+                continue
+            return date_tuple
+    if valid_pattern.fullmatch(value):
+        return None
+    # print(f"unexpected date format -{value}-")
+    # return None
+    raise Exception(f"unexpected date format -{value}-")
+
+
+@transaction.atomic
+def apply_changes():
+    # fix generation_date
+    for ar in AchillesResults.objects.filter(analysis_id=0):
+        # upload = ar.data_source.uploadhistory_set.latest()
+        # print("upload", upload.pk)
+        if (
+            ar.stratum_3
+            and (new_date := _convert_value(with_hiphen, ar.stratum_3)) is not None
+        ):
+            year, month, day = new_date
+            # old = ar.stratum_3
+            ar.stratum_3 = f"{year}-{month}-{day}"
+            # print("from", old, "to", ar.stratum_3)
+            ar.save()
+    for ar in AchillesResults.objects.filter(analysis_id=5000):
+        # upload = ar.data_source.uploadhistory_set.latest()
+        # print("upload", upload.pk)
+        # fix source release date
+        if (
+            ar.stratum_2
+            and (new_date := _convert_value(with_hiphen, ar.stratum_2)) is not None
+        ):
+            year, month, day = new_date
+            # old = ar.stratum_2
+            ar.stratum_2 = f"{year}-{month}-{day}"
+            # print("source release from", old, "to", ar.stratum_2)
+            ar.save()
+        # fix cdm release date
+        if (
+            ar.stratum_3
+            and (new_date := _convert_value(with_hiphen, ar.stratum_3)) is not None
+        ):
+            year, month, day = new_date
+            # old = ar.stratum_3
+            ar.stratum_3 = f"{year}-{month}-{day}"
+            # print("cdm release from", old, "to", ar.stratum_3)
+            ar.save()
diff --git a/dashboard_viewer/utils/get_uploads_information.py b/dashboard_viewer/utils/get_uploads_information.py
new file mode 100644
index 00000000..0d48ed7e
--- /dev/null
+++ b/dashboard_viewer/utils/get_uploads_information.py
@@ -0,0 +1,10 @@
+from uploader.models import DataSource, UploadHistory
+
+for db in DataSource.objects.all():
+    print(f"{db.acronym},{db.name},{db.hash}", end="")
+    try:
+        last_upload = db.uploadhistory_set.latest()
+    except UploadHistory.DoesNotExist:
+        print()
+    else:
+        print(f",{last_upload.upload_date},{last_upload.generation_date}")
diff --git a/docker/.env-example b/docker/.env-example
index 73dbc6c3..29c5de64 100644
--- a/docker/.env-example
+++ b/docker/.env-example
@@ -18,14 +18,15 @@ SUPERSET_MAPBOX_API_KEY=...
 POSTGRES_DASHBOARD_VIEWER_USER=cdm
 POSTGRES_DASHBOARD_VIEWER_PASSWORD=cdm
 POSTGRES_DASHBOARD_VIEWER_DB=cdm
-# vv CHANGE VARIABLE BELOW vv
-DASHBOARD_VIEWER_SECRET_KEY=secret
-
 
 POSTGRES_ACHILLES_USER=achilles
 POSTGRES_ACHILLES_PASSWORD=achilles
 POSTGRES_ACHILLES_DB=achilles
 
+# vv CHANGE VARIABLES BELOW vv
+DASHBOARD_VIEWER_SECRET_KEY=secret
+SUPERSET_SECRET_KEY=secret
+
 VOLUMES_PATH=./volumes
 
 #production or development
diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml
index dd998383..baea5c2c 100644
--- a/docker/docker-compose-dev.yml
+++ b/docker/docker-compose-dev.yml
@@ -22,6 +22,7 @@ x-superset-environment: &superset-environment
   REDIS_HOST: redis
   REDIS_PORT: 6379
   REDIS_RESULTS_DB: 3
+  SECRET_KEY: $SUPERSET_SECRET_KEY
   SUPERSET_ENV: production
 
 x-dashboard-build: &dashboard-build
@@ -43,7 +44,7 @@ x-dashboard-environment: &dashboard-environment
   REDIS_CELERY_DB: 1
   REDIS_CONSTANCE_DB: 2
   SECRET_KEY: ${DASHBOARD_VIEWER_SECRET_KEY}
-  DASHBOARD_VIEWER_ENV: ${INSTALLATION_ENV}
+  DASHBOARD_VIEWER_ENV: development
 
 version: "3.7"
 services:
@@ -110,11 +111,12 @@ services:
   dashboard_worker:
     build: *dashboard-build
     environment: *dashboard-environment
-    command: celery -A dashboard_viewer worker -Ofair -l INFO
+    command: celery -A dashboard_viewer worker -Ofair -l DEBUG
     restart: unless-stopped
     depends_on: *depends-on
     volumes:
       - ../dashboard_viewer/media:/app/media
+      - ../dashboard_viewer:/app
 
   dashboard:
     build: *dashboard-build
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 655fc32b..71686796 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -19,6 +19,7 @@ x-superset-environment: &superset-environment
   REDIS_HOST: redis
   REDIS_PORT: 6379
   REDIS_RESULTS_DB: 3
+  SECRET_KEY: $SUPERSET_SECRET_KEY
   SUPERSET_ENV: production
 
 x-dashboard-environment: &dashboard-environment
diff --git a/docs/02-installation.md b/docs/02-installation.md
index ec3c7548..9f074de1 100644
--- a/docs/02-installation.md
+++ b/docs/02-installation.md
@@ -12,9 +12,9 @@ Currently, we use docker to deploy our environment
 
 1. Clone the repository with the command `git clone --recurse-submodules https://github.com/EHDEN/NetworkDashboards`. If you already cloned the repository without the `--recurse-submodules` option, run `git submodule update --init` to fetch the superset submodule.
 
-2. Create a `.env` file on the `docker` directory, using `.env-example` as a reference, setting all necessary environment variables (`SUPERSET\_MAPBOX\_API\_KEY` and `DASHBOARD\_VIEWER\_SECRET\_KEY`).
+2. Create a `.env` file on the `docker` directory, using `.env-example` as a reference, setting all necessary environment variables (`SUPERSET_MAPBOX_API_KEY` and `DASHBOARD_VIEWER_SECRET_KEY`).
 
-   2.1 If you will use this application as a third-party application and will iframe it, set the variable `SINGLE\_APPLICATION\_MODE` to `False` and define the host of the main application on the variable `MAIN\_APPLICATION\_HOST`. Also make sure to add this last host to the list of `ALLOWED\_HOSTS`.
+   2.1 If you will use this application as a third-party application and will iframe it, set the variable `SINGLE_APPLICATION_MODE` to `False` and define the host of the main application on the variable `MAIN_APPLICATION_HOST`. Also make sure to add this last host to the list of `ALLOWED_HOSTS`.
 
 ### Dashboard Viewer setup {-}
 
@@ -105,7 +105,7 @@ The concepts table is not in the repository due to its dimension, therefore we u
 4. By default Superset's admin user credentials are admin/admin.
    It is recommended that you change the password if you will use this in a production environment.
 
-5. To any anonymous user view dashboards, add the following:
+5. To any anonymous user view dashboards, add the following permissions to the public role:
 
    - all datasource access on all_datasource_access
    - can csrf token on Superset
@@ -115,6 +115,8 @@ The concepts table is not in the repository due to its dimension, therefore we u
    - can read on CssTemplate
    - can read on Dashboard
 
+6. For each dashboard you want anonymous users to be able to access, on the dashboard list page click edit (the pencil on the right) and add the "Admin" and "Public" roles to the "Roles with acess" field.
+
 ### Dummy data {-}
 
 On a fresh installation, there are no achilles_results data so Superset's dashboards will display "No results". On the root of this repository, you can find the `demo` directory where we have an ACHILLES results file with synthetic data that you can upload to a data source on the uploader app of the dashboard viewer (http://localhost/uploader). If you wish to compare multiple data sources, on the `demo` directory there is also a python script that allows you to generate new ACHILLES results files, where it generates random count values based on the ranges of values for each set of analysis_id and stratums present on a base ACHILLES results file. So, from the one ACHILLES results fill we provided, you can have multiple data sources with different data.
diff --git a/docs/03-general.md b/docs/03-general.md
index 248d83f2..edb6db3d 100644
--- a/docs/03-general.md
+++ b/docs/03-general.md
@@ -40,7 +40,8 @@ SELECT source.name,
        source.database_type,
        source.acronym
 FROM public.data_source AS source
-INNER JOIN public.country AS country ON source.country_id=country.id
+INNER JOIN public.country AS country
+  ON source.country_id=country.id
 ```
 
 #### Chart settings {-}
@@ -110,8 +111,10 @@ SELECT  source.name AS source,
         concepts.concept_name AS gender,
         achilles.count_value as count
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.country AS country ON source.country_id=country.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.country AS country
+  ON source.country_id=country.id
 JOIN (
   SELECT '8507' AS concept_id, 'Male' AS concept_name
   UNION
@@ -147,15 +150,17 @@ WHERE analysis_id = 2
 <p class="caption">(\#fig:patientsPerCountry)Settings for creating the Patients per Country chart</p>
 </div>
 
-#### SQL query {#patientsPerCountryQuery} {-}
+#### SQL query {-#patientsPerCountryQuery}
 
 ```sql
 SELECT country.country,
        source.database_type,
        count_value
-FROM public.achilles_results AS achilles 
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.country AS country ON source.country_id=country.id
+FROM public.achilles_results AS achilles
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.country AS country
+  ON source.country_id=country.id
 WHERE analysis_id = 1
 ```
 
@@ -221,7 +226,8 @@ SELECT  name,
         longitude,
         country
 FROM public.data_source AS source
-INNER JOIN public.country AS country ON source.country_id=country.id
+INNER JOIN public.country AS country
+  ON source.country_id=country.id
 ```
 
 #### Chart settings {-}
@@ -257,7 +263,8 @@ SELECT
   stratum_4 as "cdm_version",
   stratum_5 as "vocabulary_version"
 FROM achilles_results
-JOIN data_source ON achilles_results.data_source_id = data_source.id
+JOIN data_source
+  ON achilles_results.data_source_id = data_source.id
 JOIN country ON data_source.country_id = country.id
 WHERE analysis_id=5000
 ```
diff --git a/docs/04-person.md b/docs/04-person.md
index 59058e78..6ba33981 100644
--- a/docs/04-person.md
+++ b/docs/04-person.md
@@ -69,19 +69,39 @@ No SQL query, use the sql table `data_source` of the `achilles` database.
 ```sql
 SELECT source.name,
        source.acronym,
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) < 10 THEN count_value END) AS "0-10",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 10 AND CAST(stratum_2 AS INTEGER) < 20 THEN count_value END) AS "10-20",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 20 AND CAST(stratum_2 AS INTEGER) < 30 THEN count_value END) AS "20-30",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 30 AND CAST(stratum_2 AS INTEGER) < 40 THEN count_value END) AS "30-40",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 40 AND CAST(stratum_2 AS INTEGER) < 50 THEN count_value END) AS "40-50",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 50 AND CAST(stratum_2 AS INTEGER) < 60 THEN count_value END) AS "50-60",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 60 AND CAST(stratum_2 AS INTEGER) < 70 THEN count_value END) AS "60-70",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 70 AND CAST(stratum_2 AS INTEGER) < 80 THEN count_value END) AS "70-80",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 80 AND CAST(stratum_2 AS INTEGER) < 90 THEN count_value END) AS "80-90",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 90 THEN count_value END) AS "90+"
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) < 10
+         THEN count_value END) AS "0-10",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 10
+         AND CAST(stratum_2 AS INTEGER) < 20
+         THEN count_value END) AS "10-20",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 20
+         AND CAST(stratum_2 AS INTEGER) < 30
+         THEN count_value END) AS "20-30",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 30
+         AND CAST(stratum_2 AS INTEGER) < 40
+         THEN count_value END) AS "30-40",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 40
+         AND CAST(stratum_2 AS INTEGER) < 50
+         THEN count_value END) AS "40-50",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 50
+         AND CAST(stratum_2 AS INTEGER) < 60
+         THEN count_value END) AS "50-60",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 60
+         AND CAST(stratum_2 AS INTEGER) < 70
+         THEN count_value END) AS "60-70",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 70
+         AND CAST(stratum_2 AS INTEGER) < 80
+         THEN count_value END) AS "70-80",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 80
+         AND CAST(stratum_2 AS INTEGER) < 90
+         THEN count_value END) AS "80-90",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 90
+         THEN count_value END) AS "90+"
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.concept
+  ON CAST(stratum_1 AS BIGINT) = concept_id
 WHERE analysis_id = 102
 GROUP BY name, acronym
 ```
@@ -115,7 +135,8 @@ SELECT source.name,
     count_value AS count, 
     source.acronym
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 101
 ```
 
@@ -154,7 +175,8 @@ SELECT source.name,
        stratum_1 AS "Birth_year",
        count_value AS count
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 3
 ```
 
@@ -195,7 +217,8 @@ SELECT source.name,
        count_value AS Number_of_persons,
        source.acronym
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 JOIN (
   SELECT '8507' AS concept_id, 'Male' AS concept_name
   UNION
diff --git a/docs/05-observation_period.md b/docs/05-observation_period.md
index f3273d5a..598d54a7 100644
--- a/docs/05-observation_period.md
+++ b/docs/05-observation_period.md
@@ -47,7 +47,7 @@ No SQL query, use the sql table `data_source` of the `achilles` database.
     - Date Filter: off
     - Instant Filtering: on
 
-### Number of Patients in Observation Period {#numInObservationPeriod} {-}
+### Number of Patients in Observation Period {-#numInObservationPeriod}
 
 The Number of Patients in Observation Period plot shows the number of patients that contribute at least one day in a specific month.
 
@@ -64,7 +64,8 @@ SELECT source.name,
        to_date(stratum_1, 'YYYYMM') as Date,
        count_value
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 110
 ```
 
@@ -103,7 +104,8 @@ SELECT source.name,
        to_date(stratum_1, 'YYYYMM') AS year_month,
        count_value
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 111
 ```
 
@@ -142,7 +144,8 @@ SELECT source.name,
        to_date(stratum_1, 'YYYYMM') AS year_month,
        count_value
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 112
 ```
 
diff --git a/docs/06-visit.md b/docs/06-visit.md
index 589e3e7e..4408015c 100644
--- a/docs/06-visit.md
+++ b/docs/06-visit.md
@@ -49,7 +49,7 @@ No SQL query, use the sql table `data_source` of the `achilles` database.
     - Date Filter: off
     - Instant Filtering: on
 
-### Visit Type Table {#visitTypeTable} {-}
+### Visit Type Table {-#visitTypeTable}
 
 <div class="figure">
 <img src="images/06-visit/02-visit_types_table.png" alt="Settings for creating the Visit Type Table chart" width="100%" />
@@ -64,8 +64,10 @@ SELECT source.name,
        concept_name AS "Type",
        MAX(count_value) AS "Count"
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.concept
+  ON CAST(stratum_1 AS BIGINT) = concept_id
 WHERE analysis_id = 201
 GROUP BY name, acronym, "Type"
 ORDER BY "Count" DESC
@@ -97,8 +99,10 @@ SELECT source.name,
        concept_name AS "Observation", 
        count_value
 FROM public.achilles_results AS achilles 
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.concept
+  ON CAST(stratum_1 AS BIGINT) = concept_id
 WHERE analysis_id = 201
 ```
 
diff --git a/docs/07-death.md b/docs/07-death.md
index 02555010..06a0ff45 100644
--- a/docs/07-death.md
+++ b/docs/07-death.md
@@ -61,7 +61,8 @@ SELECT source.name,
     count_value,
     source.acronym
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 501
 ```
 
@@ -97,7 +98,8 @@ SELECT source.name,
     EXTRACT(year FROM TO_DATE(stratum_1, 'YYYYMM')) AS Date,
     count_value
 FROM public.achilles_results as achilles
-INNER JOIN public.data_source as source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source as source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 502
 ```
 
diff --git a/docs/08-concepts_browser.md b/docs/08-concepts_browser.md
index 6f794ae3..04183f5a 100644
--- a/docs/08-concepts_browser.md
+++ b/docs/08-concepts_browser.md
@@ -37,10 +37,15 @@ SELECT concept_name,
      domain_id,
      source.name AS source_name,
      source.acronym
-FROM achilles_results
-JOIN concept ON cast(stratum_1 AS BIGINT) = concept_id
-INNER JOIN public.data_source AS source ON data_source_id=source.id
-WHERE analysis_id in (201, 401, 601, 701, 801, 901, 1001, 1801, 200, 400, 600, 700, 800, 1800)
+FROM achilles_results JOIN concept
+  ON cast(stratum_1 AS BIGINT) = concept_id
+INNER JOIN public.data_source AS source
+  ON data_source_id=source.id
+WHERE
+  analysis_id in (
+    201, 401, 601, 701, 801, 901, 1001, 1801,
+    200, 400, 600, 700, 800, 1800
+  )
 ```
 
 #### Chart settings {-}
@@ -98,21 +103,33 @@ SELECT
     sum(q1.count_value) as "Occurrence_count",
     sum(q1.count_person) as "Person_count",
     CASE 
-        WHEN sum(q1.count_value)<=10 THEN '<=10'
-        WHEN sum(q1.count_value)<=100 THEN '11-10ˆ2'
-        WHEN sum(q1.count_value)<=1000 THEN '10ˆ2-10ˆ3'
-        WHEN sum(q1.count_value)<=10000 THEN '10ˆ3-10ˆ4'
-        WHEN sum(q1.count_value)<=100000 THEN '10ˆ4-10ˆ5'
-        WHEN sum(q1.count_value)<=1000000 THEN '10ˆ5-10ˆ6'
+        WHEN sum(q1.count_value)<=10
+          THEN '<=10'
+        WHEN sum(q1.count_value)<=100
+          THEN '11-10ˆ2'
+        WHEN sum(q1.count_value)<=1000
+          THEN '10ˆ2-10ˆ3'
+        WHEN sum(q1.count_value)<=10000
+          THEN '10ˆ3-10ˆ4'
+        WHEN sum(q1.count_value)<=100000
+          THEN '10ˆ4-10ˆ5'
+        WHEN sum(q1.count_value)<=1000000
+          THEN '10ˆ5-10ˆ6'
         ELSE '>10ˆ6'
     END as "magnitude_occurrences",
     CASE 
-        WHEN sum(q1.count_person)<=10 THEN '<=10'
-        WHEN sum(q1.count_person)<=100 THEN '11-10ˆ2'
-        WHEN sum(q1.count_person)<=1000 THEN '10ˆ2-10ˆ3'
-        WHEN sum(q1.count_person)<=10000 THEN '10ˆ3-10ˆ4'
-        WHEN sum(q1.count_person)<=100000 THEN '10ˆ4-10ˆ5'
-        WHEN sum(q1.count_person)<=1000000 THEN '10ˆ5-10ˆ6'
+        WHEN sum(q1.count_person)<=10
+          THEN '<=10'
+        WHEN sum(q1.count_person)<=100
+          THEN '11-10ˆ2'
+        WHEN sum(q1.count_person)<=1000
+          THEN '10ˆ2-10ˆ3'
+        WHEN sum(q1.count_person)<=10000
+          THEN '10ˆ3-10ˆ4'
+        WHEN sum(q1.count_person)<=100000
+          THEN '10ˆ4-10ˆ5'
+        WHEN sum(q1.count_person)<=1000000
+          THEN '10ˆ5-10ˆ6'
         ELSE '>10ˆ6'
     END AS "magnitude_persons"
 FROM (SELECT analysis_id,
@@ -122,8 +139,13 @@ FROM (SELECT analysis_id,
              domain_id,
              count_value, 0 as count_person
     FROM achilles_results
-    JOIN concept ON cast(stratum_1 AS BIGINT)=concept_id
-    WHERE analysis_id in (201, 301, 401, 601, 701, 801, 901, 1001, 1801)
+    JOIN concept
+      ON cast(stratum_1 AS BIGINT)=concept_id
+    WHERE
+      analysis_id in (
+        201, 301, 401, 601, 701, 801, 901, 1001,
+        1801
+      )
     UNION (SELECT  analysis_id,
                    stratum_1 concept_id,
                    data_source_id,
@@ -132,11 +154,27 @@ FROM (SELECT analysis_id,
                    0 as count_value,
                    sum(count_value) as count_person
             FROM  achilles_results
-            JOIN concept on cast(stratum_1 as BIGINT)=concept_id
-            WHERE analysis_id in (202, 401, 601, 701, 801, 901, 1001, 1801)
-            GROUP BY analysis_id,stratum_1,data_source_id,concept_name,domain_id) ) as q1
-    INNER JOIN public.data_source AS source ON q1.data_source_id=source.id
-GROUP BY q1.concept_id,q1.concept_name,q1.domain_id,source.name, acronym
+            JOIN concept
+              ON cast(stratum_1 as BIGINT)=concept_id
+            WHERE
+              analysis_id in (
+                202, 401, 601, 701, 801, 901, 1001, 1801
+              )
+            GROUP BY
+              analysis_id,
+              stratum_1,
+              data_source_id,
+              concept_name,
+              domain_id
+            )) as q1
+    INNER JOIN public.data_source AS source
+      ON q1.data_source_id=source.id
+GROUP BY
+  q1.concept_id,
+  q1.concept_name,
+  q1.domain_id,
+  source.name,
+  acronym
 ORDER BY "Person_count" desc
 ```
 
diff --git a/docs/09-provenance.md b/docs/09-provenance.md
index 76123c50..ab009bc1 100644
--- a/docs/09-provenance.md
+++ b/docs/09-provenance.md
@@ -61,18 +61,26 @@ All 6 charts use the same sql query.
 ```sql
 SELECT source.name,
     source.acronym,
-    CASE WHEN analysis_id = 405 THEN 'Condition'
-    WHEN analysis_id = 605 THEN 'Procedure'
-    WHEN analysis_id = 705 THEN 'Drug'
-    WHEN analysis_id = 805 THEN 'Observation'
-    WHEN analysis_id = 1805 THEN 'Measurement'
-    WHEN analysis_id = 2105 THEN 'Device'
+    CASE WHEN analysis_id = 405
+      THEN 'Condition'
+    WHEN analysis_id = 605
+      THEN 'Procedure'
+    WHEN analysis_id = 705
+      THEN 'Drug'
+    WHEN analysis_id = 805
+      THEN 'Observation'
+    WHEN analysis_id = 1805
+      THEN 'Measurement'
+    WHEN analysis_id = 2105
+      THEN 'Device'
     ELSE 'Other' END AS domain_name,
     concept_name,
     SUM(count_value) AS num_records
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.concept AS c1 ON CAST(stratum_2 AS BIGINT) = concept_id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.concept AS c1
+  ON CAST(stratum_2 AS BIGINT) = concept_id
 WHERE analysis_id IN (405,605,705,805,1805,2105)
 GROUP BY source.name, source.acronym, concept_name, 
     CASE WHEN analysis_id = 405 THEN 'Condition'
diff --git a/docs/10-data_domains.md b/docs/10-data_domains.md
index ec38a952..65daf265 100644
--- a/docs/10-data_domains.md
+++ b/docs/10-data_domains.md
@@ -47,7 +47,7 @@ No SQL query, use the sql table `data_source` of the `achilles` database.
     - Date Filter: off
     - Instant Filtering: on
 
-### Average Number of Records per Person {#avgRecordsPerPerson} {-}
+### Average Number of Records per Person {-#avgRecordsPerPerson}
 
 <div class="figure">
 <img src="images/10-data_domain/02-avg_records_per_person.png" alt="Settings for creating the Data Source filter chart" width="100%" />
@@ -61,25 +61,41 @@ SELECT
     source.name,
     source.acronym,
     CASE 
-    WHEN analysis_id = 201 THEN 'Visit'
-    WHEN analysis_id = 401 THEN 'Condition'
-    WHEN analysis_id = 501 THEN 'Death'
-    WHEN analysis_id = 601 THEN 'Procedure'
-    WHEN analysis_id = 701 THEN 'Drug Exposure'
-    WHEN analysis_id = 801 THEN 'Observation'
-    WHEN analysis_id = 1801 THEN 'Measurement'
-    WHEN analysis_id = 2101 THEN 'Device'
-    WHEN analysis_id = 2201 THEN 'Note'
+    WHEN analysis_id = 201
+      THEN 'Visit'
+    WHEN analysis_id = 401
+      THEN 'Condition'
+    WHEN analysis_id = 501
+      THEN 'Death'
+    WHEN analysis_id = 601
+      THEN 'Procedure'
+    WHEN analysis_id = 701
+      THEN 'Drug Exposure'
+    WHEN analysis_id = 801
+      THEN 'Observation'
+    WHEN analysis_id = 1801
+      THEN 'Measurement'
+    WHEN analysis_id = 2101
+      THEN 'Device'
+    WHEN analysis_id = 2201
+      THEN 'Note'
     END AS Data_Domain,
-    SUM(count_value) /AVG(num_persons) AS "records_per_person"
+    SUM(count_value) /AVG(num_persons)
+      AS "records_per_person"
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 INNER JOIN (
   SELECT data_source_id , count_value as num_persons
   FROM achilles_results
-  WHERE analysis_id = 1) counts ON achilles.data_source_id = counts.data_source_id 
+  WHERE analysis_id = 1) counts
+    ON achilles.data_source_id = counts.data_source_id
 GROUP BY analysis_id, source.name, source.acronym
-HAVING analysis_id IN (201, 401, 501, 601, 701, 801, 1801, 2101, 2201)
+HAVING
+  analysis_id IN (
+    201, 401, 501, 601, 701, 801, 1801, 2101,
+    2201
+  )
 ```
 
 #### Chart settings {-}
diff --git a/docs/404.html b/docs/404.html
index 53be2143..e2042a2d 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
diff --git a/docs/DataNetworkDashboards.epub b/docs/DataNetworkDashboards.epub
index ae37f520..0fa596f0 100644
Binary files a/docs/DataNetworkDashboards.epub and b/docs/DataNetworkDashboards.epub differ
diff --git a/docs/DataNetworkDashboards.pdf b/docs/DataNetworkDashboards.pdf
index d076ca53..01d31751 100644
Binary files a/docs/DataNetworkDashboards.pdf and b/docs/DataNetworkDashboards.pdf differ
diff --git a/docs/DataNetworkDashboards.tex b/docs/DataNetworkDashboards.tex
index 6c764ded..12aa4541 100644
--- a/docs/DataNetworkDashboards.tex
+++ b/docs/DataNetworkDashboards.tex
@@ -120,7 +120,7 @@
 
 \title{Data Network Dashboards}
 \author{This document is currently under construction}
-\date{2022-01-04}
+\date{2022-06-18}
 
 \begin{document}
 \maketitle
@@ -244,9 +244,9 @@ \subsection*{First Steps}\label{first-steps}}
 \item
   Clone the repository with the command \texttt{git\ clone\ -\/-recurse-submodules\ https://github.com/EHDEN/NetworkDashboards}. If you already cloned the repository without the \texttt{-\/-recurse-submodules} option, run \texttt{git\ submodule\ update\ -\/-init} to fetch the superset submodule.
 \item
-  Create a \texttt{.env} file on the \texttt{docker} directory, using \texttt{.env-example} as a reference, setting all necessary environment variables (\texttt{SUPERSET\textbackslash{}\_MAPBOX\textbackslash{}\_API\textbackslash{}\_KEY} and \texttt{DASHBOARD\textbackslash{}\_VIEWER\textbackslash{}\_SECRET\textbackslash{}\_KEY}).
+  Create a \texttt{.env} file on the \texttt{docker} directory, using \texttt{.env-example} as a reference, setting all necessary environment variables (\texttt{SUPERSET\_MAPBOX\_API\_KEY} and \texttt{DASHBOARD\_VIEWER\_SECRET\_KEY}).
 
-  2.1 If you will use this application as a third-party application and will iframe it, set the variable \texttt{SINGLE\textbackslash{}\_APPLICATION\textbackslash{}\_MODE} to \texttt{False} and define the host of the main application on the variable \texttt{MAIN\textbackslash{}\_APPLICATION\textbackslash{}\_HOST}. Also make sure to add this last host to the list of \texttt{ALLOWED\textbackslash{}\_HOSTS}.
+  2.1 If you will use this application as a third-party application and will iframe it, set the variable \texttt{SINGLE\_APPLICATION\_MODE} to \texttt{False} and define the host of the main application on the variable \texttt{MAIN\_APPLICATION\_HOST}. Also make sure to add this last host to the list of \texttt{ALLOWED\_HOSTS}.
 \end{enumerate}
 
 \hypertarget{dashboard-viewer-setup}{%
@@ -370,7 +370,7 @@ \subsection*{Superset setup}\label{superset-setup}}
   By default Superset's admin user credentials are admin/admin.
   It is recommended that you change the password if you will use this in a production environment.
 \item
-  To any anonymous user view dashboards, add the following:
+  To any anonymous user view dashboards, add the following permissions to the public role:
 
   \begin{itemize}
   \tightlist
@@ -389,6 +389,8 @@ \subsection*{Superset setup}\label{superset-setup}}
   \item
     can read on Dashboard
   \end{itemize}
+\item
+  For each dashboard you want anonymous users to be able to access, on the dashboard list page click edit (the pencil on the right) and add the ``Admin'' and ``Public'' roles to the ``Roles with acess'' field.
 \end{enumerate}
 
 \hypertarget{dummy-data}{%
@@ -575,7 +577,7 @@ \subsection*{Catalogue Results Files}\label{catalogue-results-files}}
 
 The next table is presented where the previous data is stored on the rows with analysis id 0 and 5000:
 
-\begin{longtable}[]{@{}llllll@{}}
+\begin{longtable}[]{@{}rlllll@{}}
 \toprule
 Analysis Id & Stratum 1 & Stratum 2 & Stratum 3 & Stratum 4 & Stratum 5\tabularnewline
 \midrule
@@ -681,7 +683,7 @@ \chapter{Backups}\label{backups}}
 \item
   Create a credentials file (the structure of the file depends on the target cloud server)
 \item
-  Create a \texttt{.dashboards\_backups.conf} file under your home directory (variable \texttt{\$HOME}) using \texttt{dashboards\_backups.conf.example} as base, setting the appropriate value for the several variables.
+  Create a \texttt{backups.conf} under the \texttt{backups} directory using \texttt{backups.conf.example} as base, setting the appropriate value for the several variables.
 
   For variables associated with files and directories always use \emph{absolute} paths.
 
@@ -743,81 +745,23 @@ \chapter{Backups}\label{backups}}
 \end{enumerate}
 
 \hypertarget{restore}{%
-\section{Restore}\label{restore}}
+\subsection*{Restore}\label{restore}}
+\addcontentsline{toc}{subsection}{Restore}
 
 \begin{enumerate}
 \def\labelenumi{\arabic{enumi}.}
 \item
-  Select the compressed backup you want to restore and decompress it:
-
-  \texttt{tar\ -xJf\ BACKUP\_FILE.tar.xz}.
+  Select the compressed backup you want to restore.
 \item
-  \begin{enumerate}
-  \def\labelenumii{\arabic{enumii}.}
-  \item
-    \textbf{Redis}
-
-    \begin{enumerate}
-    \def\labelenumiii{\arabic{enumiii}.}
-    \item
-      Make sure the redis docker container is down.
-    \item
-      (Re)place the file \texttt{dump.rdb} on the redis volume by the file \texttt{redis.rdb}. By default the redis volume is located where this repository was cloned on the directory \texttt{docker/volumes/redis}.
-    \item
-      Change its permissions, owner and group:
-
-\begin{verbatim}
-chmod 0644 docker/volumes/redis/dump.rdb
-sudo chown -R 999:999 docker/volumes/redis
-\end{verbatim}
-    \end{enumerate}
-  \item
-    \textbf{Postgres}
-
-    \begin{enumerate}
-    \def\labelenumiii{\arabic{enumiii}.}
-    \item
-      Make sure all containers that make changes on the database are stopped.
-    \item
-      Copy the file \texttt{postgres\_backup.sql} into the postgres container
-
-      \texttt{docker\ cp\ postgres.sql\ {[}CONTAINER\_ID{]}:/tmp}.
-    \item
-      Execute the backup script:
-
-      \texttt{docker\ exec\ -u\ root\ dashboard\_viewer\_postgres\_1\ psql\ -f\ /tmp/postgres\_backup.sql\ -U\ \textbackslash{}\$POSTGRES\_USER\ -d\ \textbackslash{}\$POSTGRES\_DB}.
-    \end{enumerate}
-  \item
-    \textbf{Media Files} If you have a volume pointing to where the media files are stored, replace all files with the ones present on the downloaded backup file. Else:
-
-    \begin{enumerate}
-    \def\labelenumiii{\arabic{enumiii}.}
-    \item
-      Bring the dashoard container up \texttt{docker-compose\ up\ -d\ dashboard}
-    \item
-      Enter in the container \texttt{docker\ exec\ -it\ {[}CONTAINER\_ID{]}\ bash}
-    \item
-      If you don't know where the media files are stored you can check the value of the MEDIA\_ROOT variable
-
-      \begin{enumerate}
-      \def\labelenumiv{\arabic{enumiv}.}
-      \item
-        \texttt{python\ manage.py\ shell}
-      \item
-        \texttt{from\ django.conf\ import\ settings}
-      \item
-        \texttt{print(settings.MEDIA\_ROOT)}
-      \end{enumerate}
-    \item
-      Remove the entire MEDIA\_ROOT directory and exit the container
-    \item
-      Copy the media directory present on the backup file to the catalogue container \texttt{docker\ cp\ -a\ collected-media\ {[}CONTAINER\_ID{]}:{[}MEDIA\_ROOT\_PARENT\_PATH{]}}
-    \end{enumerate}
-  \end{enumerate}
+  Make sure that all the environment variables are the same as the ones that were used for the chosen backup file.
+  Additionally, the \texttt{backups.conf} file is also necessary to set up, since the \texttt{TMP\_DIRECTORY} variable will be used.
+\item
+  Run the \texttt{backups/restore.sh} script.
 \end{enumerate}
 
 \hypertarget{useful-stuff}{%
-\section{Useful stuff}\label{useful-stuff}}
+\subsection*{Useful stuff}\label{useful-stuff}}
+\addcontentsline{toc}{subsection}{Useful stuff}
 
 \begin{itemize}
 \item
@@ -836,8 +780,14 @@ \section{Useful stuff}\label{useful-stuff}}
 
 \CommentTok{\# create a shared link for a directory}
 \ImportTok{from}\NormalTok{ dropbox.sharing }\ImportTok{import}\NormalTok{ SharedLinkSettings}
-\NormalTok{sharing\_settings }\OperatorTok{=}\NormalTok{ SharedLinkSettings(require\_password}\OperatorTok{=}\VariableTok{True}\NormalTok{, link\_password}\OperatorTok{=}\NormalTok{DIRECTORY\_PASSWORD)}
-\NormalTok{d.sharing\_create\_shared\_link\_with\_settings(DIRECTORY\_PATH, sharing\_settings)}
+\NormalTok{sharing\_settings }\OperatorTok{=}\NormalTok{ SharedLinkSettings(}
+\NormalTok{    require\_password}\OperatorTok{=}\VariableTok{True}\NormalTok{,}
+\NormalTok{    link\_password}\OperatorTok{=}\NormalTok{DIRECTORY\_PASSWORD,}
+\NormalTok{)}
+\NormalTok{d.sharing\_create\_shared\_link\_with\_settings(}
+\NormalTok{    DIRECTORY\_PATH,}
+\NormalTok{    sharing\_settings,}
+\NormalTok{)}
 
 \CommentTok{\# get all links}
 \ControlFlowTok{for}\NormalTok{ link }\KeywordTok{in}\NormalTok{ d.sharing\_get\_shared\_links().links:}
@@ -962,26 +912,18 @@ \subsection*{Repository Structure Description}\label{repository-structure-descri
 \subsection*{Superset}\label{superset}}
 \addcontentsline{toc}{subsection}{Superset}
 
-Currently, we have a custom chart plugin on our superset installation which doesn't allow us to use superset's pre-built images available on their docker hub, since we have to call npm's build procedures on the front-end code.
-To build our custom docker image we used superset's \href{https://github.com/apache/superset/blob/1.0.1/Dockerfile}{Dockerfile} as a base, where we removed the Dev section and added some code to install our chart plugins before building the front-end code.
-Also, to make Superset import our custom chart plugins, some changes have to be made to the \href{https://github.com/apache/superset/blob/1.0.1/superset-frontend/src/visualizations/presets/MainPreset.js}{superset-frontend/src/visualizations/presets/MainPreset.js} file.
+Currently, we have made some modifications to the box plot visualization on our superset installation which doesn't allow us to use superset's pre-built images available on their docker hub, since we have to call npm's build procedures on the front-end code.
+To build our custom docker image we used superset's \href{https://github.com/apache/superset/blob/1.5.0/Dockerfile}{Dockerfile} as a base, where we removed the Dev section and added some code to install our chart plugins before building the front-end code.
 
-The changes made to the Dockerfile to install the chart plugins are in \href{https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile\#L44-L63}{this} area:
+The changes made to the Dockerfile to install the chart plugins are in \href{https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile\#L47-L49}{this} area:
 
 \begin{enumerate}
 \def\labelenumi{\arabic{enumi}.}
 \tightlist
 \item
-  L44: First we copy the \texttt{superset/plugins} directory into the container, which contains all the extra and custom chart plugins.
-\item
-  L48-51: Then we iterate over the chart plugins and execute \texttt{npm\ install\ ...} on each of them.
-  This will make changes to both the package.json and package-lock.json files and for that, we copy them into a temporary directory \texttt{package\_json\_files}.
-\item
-  L54: Then all superset's front-end code is copied into the container, which will override the package*.json files.
+  L46: Repalce some boxplot fiels with ours;
 \item
-  L56: After this, we copy our custom MainPresets.js file.
-\item
-  L60-L63: Finally, we replace the package*.json files with the ones that we saved earlier and then run the npm build command.
+  L47: Superset's original version of the controlPanel.ts file is a \texttt{.ts} versions however ours is a \texttt{.tsx}. For that, we have to remove the \texttt{.ts} version to properly override this file.
 \end{enumerate}
 
 \hypertarget{update-superset}{%
@@ -993,46 +935,25 @@ \subsubsection*{Update Superset}\label{update-superset}}
 \item
   \texttt{cd} into superset's submodule directory.
 \item
-  Get the latest tags: \texttt{git\ fetch}.
+  Get the latest tags: \texttt{git\ fetch\ -t}.
 \item
   Checkout to the new desired release tag.
 \item
   Check if there are any changes made to superset's Dockerfile (on the root of the repository for the current latest release), adapt them, and insert them on our custom Dockerfile under the \texttt{docker/superset} directory.
 \item
-  Check if there are any changes made to superset's \texttt{superset-frontend/src/visualizations/presets/MainPreset.js} file.
-  You can use the script \texttt{mainpreset\_has\_changes.py} under the \texttt{plugins} directory to check that.
-  Apply the new changes, if any, and remember to keep our chart plugins imported and registered (Currently we only have the \emph{Box plot} plugin).
-\item
-  If the version of the frontend package \texttt{@superset-ui/plugin-chart-echarts} changed it's necessary to update our box plot plugin.
-  Follow the instructions present \href{https://github.com/EHDEN/NetworkDashboards/tree/master/superset/plugins/plugins/plugin-chart-box-plot\#how-to-update}{here}, also take into account the instruction of the next section.
+  If the version of the plugin package \texttt{plugin-chart-echarts} changed, it's necessary to update our box plot plugin. If it is greater than 0.18.25, go to the history (\texttt{https://github.com/apache/superset/commits/{[}RELEASE-TAG{]}/superset-frontend/plugins/plugin-chart-echarts}) of commits done to the plugin-chart-echarts plugin update to the most recent commit, applying their changes to the files in the \texttt{superset/box-plot-overrides} directory. A fast way check the changes done between two commits: \texttt{git\ diff\ {[}old\_commit\_hash{]}\ {[}recent\_commit\_hash{]}\ -\/-\ superset-frontend/plugins/plugin-chart-echarts}
 \end{enumerate}
 
 \hypertarget{chart-plugin-development}{%
 \subsubsection*{Chart Plugin Development}\label{chart-plugin-development}}
 \addcontentsline{toc}{subsubsection}{Chart Plugin Development}
 
-Instructions on how you can set up your development environment to develop on a custom superset chart plugin:
-
 \begin{enumerate}
 \def\labelenumi{\arabic{enumi}.}
 \item
-  Clone the \href{https://github.com/apache/superset}{superset} repository.
-  \textbf{IMPORTANT NOTE}: Since we build the superset's docker image using the existing superset's submodule, it's better not to use it to develop the plugins.
-  If you decide to use it anyways, remember \href{https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile\#L54}{this} and \href{https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile\#L99}{this} steps.
-  They might override directories (\texttt{superset-frontend/node\_modules} and \texttt{superset/static/assets}) that are generated during the build process, which can cause frontend compilation errors or the app can serve outdated static files.
-\item
-  Clone the \href{https://github.com/apache-superset/superset-ui}{superset-ui} repository into the directory superset-frontend of superset's repository.
+  Follow the instructions of \href{https://superset.apache.org/docs/contributing/creating-viz-plugins}{this tutorial} to create the necessary base files of your plugin.
 \item
-  Follow the instructions of \href{https://superset.apache.org/docs/installation/building-custom-viz-plugins}{this tutorial} to create the necessary base files of your plugin.
-\item
-  Copy the file \texttt{MainPreset.js} present on this directory into the superset repository into the \texttt{superset-frontend/src/visualizations/presets/} directory.
-\item
-  Add the line \texttt{npm\ install\ -f\ -\/-no-optional\ -\/-save\ ./superset-frontend/superset-ui/plugins/plugin-chart-{[}your-chart-name{]}} into the file \texttt{docker/docker-frontend.sh} of the superset repository before the existing \texttt{npm\ install\ ...} commands.
-\item
-  When the development is finished, on the root of the superset-ui repository run \texttt{yarn\ install} and then \texttt{yarn\ build\ {[}your-chart-name{]}}.
-\item
-  Copy the directory of your plugin (including its sub-directory \texttt{esm}), within the superset-ui repository within the directory \texttt{plugins}, into the sub-directory \texttt{plugins} this directory.
-  Make sure to run the command \texttt{yarn\ build\ {[}your-chart-name{]}} before doing this step.
+  To deploy you can either use the \texttt{DYNAMIC\_PLUGINS} feature flag or you can add and build your plugins in \texttt{superset/Dockerfile}.
 \end{enumerate}
 
 \hypertarget{important-features}{%
@@ -1268,7 +1189,7 @@ \subsection*{Apps}\label{apps}}
 
 Currently, this app is not being used and the URL mapping was delete.
 To use it again uncomment the tabsManager \href{https://github.com/EHDEN/NetworkDashboards/blob/master/dashboard_viewer/dashboard_viewer/urls.py\#L29}{line} on the dashboard\_viewer/dashboard\_viewer/urls.py file.
-Then you can access the tabs page through the \texttt{{[}BASE\_RUL{]}/tabs/} URL.
+Then you can access the tabs page through the \texttt{{[}BASE\_URL{]}/tabs/} URL.
 
 Views
 
@@ -2197,11 +2118,12 @@ \subsection*{meta\_data\_table}\label{meta_data_table}}
     \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{ON}\NormalTok{ ((a.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((data\_source.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ ( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.count\_value,}
-\NormalTok{           achilles\_results.data\_source\_id,}
-\NormalTok{           achilles\_results.stratum\_2,}
-\NormalTok{           achilles\_results.stratum\_3}
-          \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{0}\NormalTok{)) p }\KeywordTok{ON}\NormalTok{ ((p.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{)))}
+\NormalTok{            achilles\_results.data\_source\_id,}
+\NormalTok{            achilles\_results.stratum\_2,}
+\NormalTok{            achilles\_results.stratum\_3}
+           \KeywordTok{FROM}\NormalTok{ achilles\_results}
+           \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{0}\NormalTok{)) p}
+      \KeywordTok{ON}\NormalTok{ p.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{)}
  \KeywordTok{WHERE}\NormalTok{ (a.analysis\_id }\OperatorTok{=} \DecValTok{5000}\NormalTok{);}
 \end{Highlighting}
 \end{Shaded}
@@ -2215,9 +2137,10 @@ \subsection*{patients\_per\_country\_and\_database\_type}\label{patients_per_cou
 \KeywordTok{SELECT}\NormalTok{ country.country,}
    \KeywordTok{source}\NormalTok{.database\_type,}
 \NormalTok{   achilles.count\_value}
-  \KeywordTok{FROM}\NormalTok{ ((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
-    \KeywordTok{JOIN}\NormalTok{ country country }\KeywordTok{ON}\NormalTok{ ((}\KeywordTok{source}\NormalTok{.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}\NormalTok{)))}
+  \KeywordTok{FROM}\NormalTok{ (}
+\NormalTok{    (achilles\_results achilles }\KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ (achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{))}
+    \KeywordTok{JOIN}\NormalTok{ country country }\KeywordTok{ON} \KeywordTok{source}\NormalTok{.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}\NormalTok{)}
  \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{1}\NormalTok{);}
 \end{Highlighting}
 \end{Shaded}
@@ -2233,8 +2156,8 @@ \subsection*{number\_of\_patients}\label{number_of_patients}}
 \NormalTok{   data\_source.acronym,}
 \NormalTok{   data\_source.database\_type,}
 \NormalTok{   country.country}
-  \KeywordTok{FROM}\NormalTok{ ((achilles\_results}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{ON}\NormalTok{ ((achilles\_results.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{)))}
+  \KeywordTok{FROM}\NormalTok{ ((achilles\_results }\KeywordTok{JOIN}\NormalTok{ data\_source}
+      \KeywordTok{ON}\NormalTok{ ((achilles\_results.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((data\_source.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}\NormalTok{)))}
  \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{1}\NormalTok{);}
 \end{Highlighting}
@@ -2253,9 +2176,11 @@ \subsection*{gender}\label{gender}}
 \NormalTok{   concept.concept\_name }\KeywordTok{AS}\NormalTok{ gender,}
 \NormalTok{   achilles.count\_value}
   \KeywordTok{FROM}\NormalTok{ (((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)))}
-    \KeywordTok{JOIN}\NormalTok{ concept }\KeywordTok{ON}\NormalTok{ ((achilles.stratum\_1 }\OperatorTok{=}\NormalTok{ (concept.concept\_id):}\CharTok{:text}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ concept}
+      \KeywordTok{ON}\NormalTok{ ((achilles.stratum\_1 }\OperatorTok{=}\NormalTok{ (concept.concept\_id):}\CharTok{:text}\NormalTok{)))}
  \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{2}\NormalTok{);}
 \end{Highlighting}
 \end{Shaded}
@@ -2271,61 +2196,107 @@ \subsection*{age1observation\_table}\label{age1observation_table}}
    \KeywordTok{source}\NormalTok{.database\_type,}
 \NormalTok{   country.country,}
    \FunctionTok{sum}\NormalTok{(}
-       \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ ((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textless{}} \DecValTok{10}\NormalTok{) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value}
-           \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:bigint}
-       \ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"0{-}10"}\NormalTok{,}
+     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ (}
+\NormalTok{       (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textless{}} \DecValTok{10}
+\NormalTok{     ) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value }\ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{ :: bigint }\ControlFlowTok{END}
+\NormalTok{   ) }\KeywordTok{AS} \OtherTok{"0{-}10"}\NormalTok{, }
    \FunctionTok{sum}\NormalTok{(}
-       \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textgreater{}=} \DecValTok{10}\NormalTok{) }\KeywordTok{AND}\NormalTok{ ((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textless{}} \DecValTok{20}\NormalTok{)) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value}
-           \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:bigint}
-       \ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"10{-}20"}\NormalTok{,}
+     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ (}
+\NormalTok{       (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textgreater{}=} \DecValTok{10}
+\NormalTok{       ) }
+       \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textless{}} \DecValTok{20}
+\NormalTok{       )}
+\NormalTok{     ) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value }\ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{ :: bigint }\ControlFlowTok{END}
+\NormalTok{   ) }\KeywordTok{AS} \OtherTok{"10{-}20"}\NormalTok{, }
    \FunctionTok{sum}\NormalTok{(}
-       \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textgreater{}=} \DecValTok{20}\NormalTok{) }\KeywordTok{AND}\NormalTok{ ((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textless{}} \DecValTok{30}\NormalTok{)) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value}
-           \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:bigint}
-       \ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"20{-}30"}\NormalTok{,}
+     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ (}
+\NormalTok{       (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textgreater{}=} \DecValTok{20}
+\NormalTok{       ) }
+       \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textless{}} \DecValTok{30}
+\NormalTok{       )}
+\NormalTok{     ) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value }\ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{ :: bigint }\ControlFlowTok{END}
+\NormalTok{   ) }\KeywordTok{AS} \OtherTok{"20{-}30"}\NormalTok{, }
    \FunctionTok{sum}\NormalTok{(}
-       \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textgreater{}=} \DecValTok{30}\NormalTok{) }\KeywordTok{AND}\NormalTok{ ((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textless{}} \DecValTok{40}\NormalTok{)) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value}
-           \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:bigint}
-       \ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"30{-}40"}\NormalTok{,}
+     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ (}
+\NormalTok{       (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textgreater{}=} \DecValTok{30}
+\NormalTok{       ) }
+       \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textless{}} \DecValTok{40}
+\NormalTok{       )}
+\NormalTok{     ) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value }\ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{ :: bigint }\ControlFlowTok{END}
+\NormalTok{   ) }\KeywordTok{AS} \OtherTok{"30{-}40"}\NormalTok{, }
    \FunctionTok{sum}\NormalTok{(}
-       \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textgreater{}=} \DecValTok{40}\NormalTok{) }\KeywordTok{AND}\NormalTok{ ((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textless{}} \DecValTok{50}\NormalTok{)) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value}
-           \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:bigint}
-       \ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"40{-}50"}\NormalTok{,}
+     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ (}
+\NormalTok{       (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textgreater{}=} \DecValTok{40}
+\NormalTok{       ) }
+       \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textless{}} \DecValTok{50}
+\NormalTok{       )}
+\NormalTok{     ) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value }\ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{ :: bigint }\ControlFlowTok{END}
+\NormalTok{   ) }\KeywordTok{AS} \OtherTok{"40{-}50"}\NormalTok{, }
    \FunctionTok{sum}\NormalTok{(}
-       \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textgreater{}=} \DecValTok{50}\NormalTok{) }\KeywordTok{AND}\NormalTok{ ((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textless{}} \DecValTok{60}\NormalTok{)) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value}
-           \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:bigint}
-       \ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"50{-}60"}\NormalTok{,}
+     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ (}
+\NormalTok{       (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textgreater{}=} \DecValTok{50}
+\NormalTok{       ) }
+       \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textless{}} \DecValTok{60}
+\NormalTok{       )}
+\NormalTok{     ) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value }\ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{ :: bigint }\ControlFlowTok{END}
+\NormalTok{   ) }\KeywordTok{AS} \OtherTok{"50{-}60"}\NormalTok{, }
    \FunctionTok{sum}\NormalTok{(}
-       \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textgreater{}=} \DecValTok{60}\NormalTok{) }\KeywordTok{AND}\NormalTok{ ((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textless{}} \DecValTok{70}\NormalTok{)) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value}
-           \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:bigint}
-       \ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"60{-}70"}\NormalTok{,}
+     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ (}
+\NormalTok{       (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textgreater{}=} \DecValTok{60}
+\NormalTok{       ) }
+       \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textless{}} \DecValTok{70}
+\NormalTok{       )}
+\NormalTok{     ) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value }\ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{ :: bigint }\ControlFlowTok{END}
+\NormalTok{   ) }\KeywordTok{AS} \OtherTok{"60{-}70"}\NormalTok{, }
    \FunctionTok{sum}\NormalTok{(}
-       \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textgreater{}=} \DecValTok{70}\NormalTok{) }\KeywordTok{AND}\NormalTok{ ((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textless{}} \DecValTok{80}\NormalTok{)) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value}
-           \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:bigint}
-       \ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"70{-}80"}\NormalTok{,}
+     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ (}
+\NormalTok{       (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textgreater{}=} \DecValTok{70}
+\NormalTok{       ) }
+       \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textless{}} \DecValTok{80}
+\NormalTok{       )}
+\NormalTok{     ) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value }\ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{ :: bigint }\ControlFlowTok{END}
+\NormalTok{   ) }\KeywordTok{AS} \OtherTok{"70{-}80"}\NormalTok{, }
    \FunctionTok{sum}\NormalTok{(}
-       \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textgreater{}=} \DecValTok{80}\NormalTok{) }\KeywordTok{AND}\NormalTok{ ((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textless{}} \DecValTok{90}\NormalTok{)) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value}
-           \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:bigint}
-       \ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"80{-}90"}\NormalTok{,}
+     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ (}
+\NormalTok{       (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textgreater{}=} \DecValTok{80}
+\NormalTok{       ) }
+       \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{         (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textless{}} \DecValTok{90}
+\NormalTok{       )}
+\NormalTok{     ) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value }\ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{ :: bigint }\ControlFlowTok{END}
+\NormalTok{   ) }\KeywordTok{AS} \OtherTok{"80{-}90"}\NormalTok{, }
    \FunctionTok{sum}\NormalTok{(}
-       \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ ((achilles.stratum\_2):}\CharTok{:integer} \OperatorTok{\textgreater{}=} \DecValTok{90}\NormalTok{) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value}
-           \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:bigint}
-       \ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"90+"}
+     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ (}
+\NormalTok{       (achilles.stratum\_2):: }\DataTypeTok{integer} \OperatorTok{\textgreater{}=} \DecValTok{90}
+\NormalTok{     ) }\ControlFlowTok{THEN}\NormalTok{ achilles.count\_value }\ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{ :: bigint }\ControlFlowTok{END}
+\NormalTok{   ) }\KeywordTok{AS} \OtherTok{"90+"} 
   \KeywordTok{FROM}\NormalTok{ (((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)))}
-    \KeywordTok{JOIN}\NormalTok{ concept }\KeywordTok{ON}\NormalTok{ ((achilles.stratum\_1 }\OperatorTok{=}\NormalTok{ (concept.concept\_id):}\CharTok{:text}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ concept}
+      \KeywordTok{ON}\NormalTok{ ((achilles.stratum\_1 }\OperatorTok{=}\NormalTok{ (concept.concept\_id):}\CharTok{:text}\NormalTok{)))}
  \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{102}\NormalTok{)}
- \KeywordTok{GROUP} \KeywordTok{BY} \KeywordTok{source}\NormalTok{.name, }\KeywordTok{source}\NormalTok{.acronym, }\KeywordTok{source}\NormalTok{.database\_type, country.country;}
+ \KeywordTok{GROUP} \KeywordTok{BY} 
+   \KeywordTok{source}\NormalTok{.name, }
+   \KeywordTok{source}\NormalTok{.acronym, }
+   \KeywordTok{source}\NormalTok{.database\_type, }
+\NormalTok{   country.country;}
 \end{Highlighting}
 \end{Shaded}
 
@@ -2342,7 +2313,8 @@ \subsection*{age1observation\_bar\_chart}\label{age1observation_bar_chart}}
    \KeywordTok{source}\NormalTok{.database\_type,}
 \NormalTok{   country.country}
   \KeywordTok{FROM}\NormalTok{ ((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)))}
  \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{101}\NormalTok{);}
 \end{Highlighting}
@@ -2366,7 +2338,8 @@ \subsection*{distribution\_of\_age\_at\_first\_observation\_period}\label{distri
 \NormalTok{   achilles.max\_value,}
 \NormalTok{   achilles.min\_value}
   \KeywordTok{FROM}\NormalTok{ ((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((}\KeywordTok{source}\NormalTok{.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}\NormalTok{)))}
  \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{103}\NormalTok{)}
  \KeywordTok{ORDER} \KeywordTok{BY} \KeywordTok{source}\NormalTok{.name;}
@@ -2386,7 +2359,8 @@ \subsection*{year\_of\_birth}\label{year_of_birth}}
 \NormalTok{   achilles.stratum\_1 }\KeywordTok{AS} \OtherTok{"Birth\_year"}\NormalTok{,}
 \NormalTok{   achilles.count\_value }\KeywordTok{AS} \FunctionTok{count}
   \KeywordTok{FROM}\NormalTok{ ((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)))}
  \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{3}\NormalTok{);}
 \end{Highlighting}
@@ -2403,27 +2377,57 @@ \subsection*{avg\_num\_of\_records\_per\_person}\label{avg_num_of_records_per_pe
    \KeywordTok{source}\NormalTok{.database\_type,}
 \NormalTok{   country.country,}
        \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{201}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Visit\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{401}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{501}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Death\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{601}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{701}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug Exposure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{801}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{1801}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{2101}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{2201}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Note\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{201}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Visit\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{401}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{501}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Death\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{601}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{701}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug Exposure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{801}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{1801}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{2101}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{2201}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Note\textquotesingle{}}\NormalTok{:}\CharTok{:text}
            \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:text}
        \ControlFlowTok{END} \KeywordTok{AS}\NormalTok{ data\_domain,}
-\NormalTok{   (}\FunctionTok{sum}\NormalTok{(achilles.count\_value) }\OperatorTok{/} \FunctionTok{avg}\NormalTok{(counts.num\_persons)) }\KeywordTok{AS}\NormalTok{ records\_per\_person}
+\NormalTok{   (}\FunctionTok{sum}\NormalTok{(achilles.count\_value) }\OperatorTok{/} \FunctionTok{avg}\NormalTok{(counts.num\_persons))}
+     \KeywordTok{AS}\NormalTok{ records\_per\_person}
   \KeywordTok{FROM}\NormalTok{ (((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)))}
     \KeywordTok{JOIN}\NormalTok{ ( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.data\_source\_id,}
 \NormalTok{           achilles\_results.count\_value }\KeywordTok{AS}\NormalTok{ num\_persons}
           \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{1}\NormalTok{)) counts }\KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=}\NormalTok{ counts.data\_source\_id)))}
- \KeywordTok{GROUP} \KeywordTok{BY}\NormalTok{ achilles.analysis\_id, }\KeywordTok{source}\NormalTok{.name, }\KeywordTok{source}\NormalTok{.acronym, }\KeywordTok{source}\NormalTok{.database\_type, country.country}
-\KeywordTok{HAVING}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{201}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{401}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{501}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{601}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{701}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2101}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2201}\NormalTok{):}\CharTok{:bigint}\NormalTok{]));}
+         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{1}\NormalTok{)) counts}
+           \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id }\OperatorTok{=}\NormalTok{ counts.data\_source\_id)}
+ \KeywordTok{GROUP} \KeywordTok{BY}
+\NormalTok{   achilles.analysis\_id,}
+   \KeywordTok{source}\NormalTok{.name,}
+   \KeywordTok{source}\NormalTok{.acronym,}
+   \KeywordTok{source}\NormalTok{.database\_type,}
+\NormalTok{   country.country}
+\KeywordTok{HAVING}
+\NormalTok{  (}
+\NormalTok{    achilles.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+      \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{201}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{401}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{501}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{601}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{701}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{801}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{1801}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{2101}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{2201}\NormalTok{):: bigint]}
+\NormalTok{    )}
+\NormalTok{  );}
 \end{Highlighting}
 \end{Shaded}
 
@@ -2438,23 +2442,51 @@ \subsection*{data\_domain\_total\_num\_of\_records}\label{data_domain_total_num_
 \NormalTok{   data\_source.database\_type,}
 \NormalTok{   country.country,}
        \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{201}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Visit\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{401}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{501}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Death\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{601}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{701}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug Exposure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{801}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{1801}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{2101}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{2201}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Note\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{201}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Visit\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{401}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{501}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Death\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{601}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{701}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug Exposure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{801}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{1801}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{2101}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{2201}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Note\textquotesingle{}}\NormalTok{:}\CharTok{:text}
            \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:text}
        \ControlFlowTok{END} \KeywordTok{AS}\NormalTok{ data\_domain,}
    \FunctionTok{sum}\NormalTok{(achilles\_results.count\_value) }\KeywordTok{AS} \FunctionTok{count}
   \KeywordTok{FROM}\NormalTok{ ((achilles\_results}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{ON}\NormalTok{ ((achilles\_results.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source}
+      \KeywordTok{ON}\NormalTok{ ((achilles\_results.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ data\_source.country\_id)))}
- \KeywordTok{GROUP} \KeywordTok{BY}\NormalTok{ data\_source.name, data\_source.acronym, data\_source.database\_type, country.country, achilles\_results.analysis\_id}
-\KeywordTok{HAVING}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{201}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{401}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{501}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{601}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{701}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2101}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2201}\NormalTok{):}\CharTok{:bigint}\NormalTok{]));}
+ \KeywordTok{GROUP} \KeywordTok{BY}
+\NormalTok{   data\_source.name,}
+\NormalTok{   data\_source.acronym,}
+\NormalTok{   data\_source.database\_type,}
+\NormalTok{   country.country,}
+\NormalTok{   achilles\_results.analysis\_id}
+\KeywordTok{HAVING}
+\NormalTok{  (}
+\NormalTok{    achilles\_results.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+      \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{201}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{401}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{501}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{601}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{701}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{801}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{1801}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{2101}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{2201}\NormalTok{):: bigint]}
+\NormalTok{    )}
+\NormalTok{  );}
 \end{Highlighting}
 \end{Shaded}
 
@@ -2469,12 +2501,18 @@ \subsection*{number\_of\_distinct\_per\_person}\label{number_of_distinct_per_per
 \NormalTok{   country.country,}
 \NormalTok{   achilles.analysis\_id,}
        \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{203}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Visit\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{403}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{603}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{703}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug Exposure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{803}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{1803}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{203}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Visit\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{403}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{603}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{703}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug Exposure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{803}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{1803}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}\NormalTok{:}\CharTok{:text}
            \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:text}
        \ControlFlowTok{END} \KeywordTok{AS}\NormalTok{ data\_domain,}
 \NormalTok{   achilles.count\_value,}
@@ -2486,9 +2524,20 @@ \subsection*{number\_of\_distinct\_per\_person}\label{number_of_distinct_per_per
 \NormalTok{   achilles.p90\_value }\KeywordTok{AS}\NormalTok{ p90,}
 \NormalTok{   achilles.max\_value}
   \KeywordTok{FROM}\NormalTok{ ((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((}\KeywordTok{source}\NormalTok{.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}\NormalTok{)))}
- \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{203}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{403}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{603}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{703}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{803}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{183}\NormalTok{):}\CharTok{:bigint}\NormalTok{]))}
+ \KeywordTok{WHERE}
+\NormalTok{   (}
+\NormalTok{     achilles.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+       \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{203}\NormalTok{):: bigint,}
+\NormalTok{       (}\DecValTok{403}\NormalTok{):: bigint,}
+\NormalTok{       (}\DecValTok{603}\NormalTok{):: bigint,}
+\NormalTok{       (}\DecValTok{703}\NormalTok{):: bigint,}
+\NormalTok{       (}\DecValTok{803}\NormalTok{):: bigint,}
+\NormalTok{       (}\DecValTok{183}\NormalTok{):: bigint]}
+\NormalTok{     )}
+\NormalTok{   )}
  \KeywordTok{ORDER} \KeywordTok{BY} \KeywordTok{source}\NormalTok{.name;}
 \end{Highlighting}
 \end{Shaded}
@@ -2504,29 +2553,58 @@ \subsection*{data\_provenance}\label{data_provenance}}
    \KeywordTok{source}\NormalTok{.database\_type,}
 \NormalTok{   country.country,}
        \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{405}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{605}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{705}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{805}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{1805}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{2105}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{405}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{605}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{705}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{805}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{1805}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{2105}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}\NormalTok{:}\CharTok{:text}
            \ControlFlowTok{ELSE} \StringTok{\textquotesingle{}Other\textquotesingle{}}\NormalTok{:}\CharTok{:text}
        \ControlFlowTok{END} \KeywordTok{AS}\NormalTok{ domain\_name,}
 \NormalTok{   c1.concept\_name,}
    \FunctionTok{sum}\NormalTok{(achilles.count\_value) }\KeywordTok{AS}\NormalTok{ num\_records}
   \KeywordTok{FROM}\NormalTok{ (((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)))}
-    \KeywordTok{JOIN}\NormalTok{ concept c1 }\KeywordTok{ON}\NormalTok{ ((achilles.stratum\_2 }\OperatorTok{=}\NormalTok{ (c1.concept\_id):}\CharTok{:text}\NormalTok{)))}
- \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{405}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{605}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{705}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{805}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1805}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2105}\NormalTok{):}\CharTok{:bigint}\NormalTok{]))}
- \KeywordTok{GROUP} \KeywordTok{BY} \KeywordTok{source}\NormalTok{.name, }\KeywordTok{source}\NormalTok{.acronym, }\KeywordTok{source}\NormalTok{.database\_type, country.country, c1.concept\_name,}
+    \KeywordTok{JOIN}\NormalTok{ concept c1}
+      \KeywordTok{ON}\NormalTok{ ((achilles.stratum\_2 }\OperatorTok{=}\NormalTok{ (c1.concept\_id):}\CharTok{:text}\NormalTok{)))}
+ \KeywordTok{WHERE}
+\NormalTok{   (}
+\NormalTok{     achilles.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+       \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{405}\NormalTok{):: bigint,}
+\NormalTok{       (}\DecValTok{605}\NormalTok{):: bigint,}
+\NormalTok{       (}\DecValTok{705}\NormalTok{):: bigint,}
+\NormalTok{       (}\DecValTok{805}\NormalTok{):: bigint,}
+\NormalTok{       (}\DecValTok{1805}\NormalTok{):: bigint,}
+\NormalTok{       (}\DecValTok{2105}\NormalTok{):: bigint]}
+\NormalTok{     )}
+\NormalTok{   )}
+ \KeywordTok{GROUP} \KeywordTok{BY}
+   \KeywordTok{source}\NormalTok{.name,}
+   \KeywordTok{source}\NormalTok{.acronym,}
+   \KeywordTok{source}\NormalTok{.database\_type,}
+\NormalTok{   country.country,}
+\NormalTok{   c1.concept\_name,}
        \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{405}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{605}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{705}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{805}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{1805}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}\NormalTok{:}\CharTok{:text}
-           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{2105}\NormalTok{) }\ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{405}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{605}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{705}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{805}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{1805}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}\NormalTok{:}\CharTok{:text}
+           \ControlFlowTok{WHEN}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{2105}\NormalTok{)}
+             \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}\NormalTok{:}\CharTok{:text}
            \ControlFlowTok{ELSE} \StringTok{\textquotesingle{}Other\textquotesingle{}}\NormalTok{:}\CharTok{:text}
        \ControlFlowTok{END}\NormalTok{;}
 \end{Highlighting}
@@ -2545,7 +2623,8 @@ \subsection*{num\_of\_patients\_in\_observation\_period}\label{num_of_patients_i
    \FunctionTok{to\_date}\NormalTok{(achilles.stratum\_1, }\StringTok{\textquotesingle{}YYYYMM\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{) }\KeywordTok{AS} \DataTypeTok{date}\NormalTok{,}
 \NormalTok{   achilles.count\_value }\KeywordTok{AS} \OtherTok{"Nr\_patients"}
   \KeywordTok{FROM}\NormalTok{ ((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)))}
  \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{110}\NormalTok{);}
 \end{Highlighting}
@@ -2557,24 +2636,60 @@ \subsection*{cumulative\_observation\_time}\label{cumulative_observation_time}}
 
 \begin{Shaded}
 \begin{Highlighting}[]
-\KeywordTok{SELECT}\NormalTok{ data\_source.name,}
-\NormalTok{   data\_source.acronym,}
-\NormalTok{   data\_source.database\_type,}
-\NormalTok{   country.country,}
-\NormalTok{   cumulative\_sums.xlengthofobservation,}
-   \FunctionTok{round}\NormalTok{((cumulative\_sums.cumulative\_sum }\OperatorTok{/}\NormalTok{ (totals.total):}\CharTok{:numeric}\NormalTok{), }\DecValTok{5}\NormalTok{) }\KeywordTok{AS}\NormalTok{ ypercentpersons}
-  \KeywordTok{FROM}\NormalTok{ (((( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.data\_source\_id,}
-\NormalTok{           ((achilles\_results.stratum\_1):}\CharTok{:integer} \OperatorTok{*} \DecValTok{30}\NormalTok{) }\KeywordTok{AS}\NormalTok{ xlengthofobservation,}
-           \FunctionTok{sum}\NormalTok{(achilles\_results.count\_value) }\KeywordTok{OVER}\NormalTok{ (}\KeywordTok{PARTITION} \KeywordTok{BY}\NormalTok{ achilles\_results.data\_source\_id }\KeywordTok{ORDER} \KeywordTok{BY}\NormalTok{ (achilles\_results.stratum\_1):}\CharTok{:integer} \KeywordTok{DESC}\NormalTok{) }\KeywordTok{AS}\NormalTok{ cumulative\_sum}
-          \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{108}\NormalTok{)) cumulative\_sums}
-    \KeywordTok{JOIN}\NormalTok{ ( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.data\_source\_id,}
-\NormalTok{           achilles\_results.count\_value }\KeywordTok{AS}\NormalTok{ total}
-          \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{1}\NormalTok{)) totals }\KeywordTok{ON}\NormalTok{ ((cumulative\_sums.data\_source\_id }\OperatorTok{=}\NormalTok{ totals.data\_source\_id)))}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{ON}\NormalTok{ ((cumulative\_sums.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{)))}
-    \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ data\_source.country\_id)))}
- \KeywordTok{ORDER} \KeywordTok{BY}\NormalTok{ data\_source.name, cumulative\_sums.xlengthofobservation;}
+\KeywordTok{SELECT}
+\NormalTok{  data\_source.name,}
+\NormalTok{  data\_source.acronym,}
+\NormalTok{  data\_source.database\_type,}
+\NormalTok{  country.country,}
+\NormalTok{  cumulative\_sums.xlengthofobservation,}
+  \FunctionTok{round}\NormalTok{(}
+\NormalTok{    (cumulative\_sums.cumulative\_sum }\OperatorTok{/}\NormalTok{ (totals.total):: }\DataTypeTok{numeric}\NormalTok{),}
+    \DecValTok{5}
+\NormalTok{  ) }\KeywordTok{AS}\NormalTok{ ypercentpersons}
+\KeywordTok{FROM}
+\NormalTok{  (}
+\NormalTok{    (}
+\NormalTok{      (}
+\NormalTok{        (}
+          \KeywordTok{SELECT}
+\NormalTok{            achilles\_results.data\_source\_id,}
+\NormalTok{            (}
+\NormalTok{              (achilles\_results.stratum\_1):: }\DataTypeTok{integer} \OperatorTok{*} \DecValTok{30}
+\NormalTok{            ) }\KeywordTok{AS}\NormalTok{ xlengthofobservation,}
+            \FunctionTok{sum}\NormalTok{(achilles\_results.count\_value) }\KeywordTok{OVER}\NormalTok{ (}
+              \KeywordTok{PARTITION} \KeywordTok{BY}\NormalTok{ achilles\_results.data\_source\_id}
+              \KeywordTok{ORDER} \KeywordTok{BY}
+\NormalTok{                (achilles\_results.stratum\_1):: }\DataTypeTok{integer} \KeywordTok{DESC}
+\NormalTok{            ) }\KeywordTok{AS}\NormalTok{ cumulative\_sum}
+          \KeywordTok{FROM}
+\NormalTok{            achilles\_results}
+          \KeywordTok{WHERE}
+\NormalTok{            (}
+\NormalTok{              achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{108}
+\NormalTok{            )}
+\NormalTok{        ) cumulative\_sums}
+        \KeywordTok{JOIN}\NormalTok{ (}
+          \KeywordTok{SELECT}
+\NormalTok{            achilles\_results.data\_source\_id,}
+\NormalTok{            achilles\_results.count\_value }\KeywordTok{AS}\NormalTok{ total}
+          \KeywordTok{FROM}
+\NormalTok{            achilles\_results}
+          \KeywordTok{WHERE}
+\NormalTok{            (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{1}\NormalTok{)}
+\NormalTok{        ) totals }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{          (}
+\NormalTok{            cumulative\_sums.data\_source\_id }\OperatorTok{=}\NormalTok{ totals.data\_source\_id}
+\NormalTok{          )}
+\NormalTok{        )}
+\NormalTok{      )}
+      \KeywordTok{JOIN}\NormalTok{ data\_source}
+        \KeywordTok{ON}\NormalTok{ ((cumulative\_sums.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{))}
+\NormalTok{    )}
+    \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ data\_source.country\_id))}
+\NormalTok{  )}
+\KeywordTok{ORDER} \KeywordTok{BY}
+\NormalTok{  data\_source.name,}
+\NormalTok{  cumulative\_sums.xlengthofobservation;}
 \end{Highlighting}
 \end{Shaded}
 
@@ -2591,14 +2706,22 @@ \subsection*{number\_of\_observation\_periods}\label{number_of_observation_perio
 \NormalTok{   ar.stratum\_1,}
 \NormalTok{   ar.count\_value,}
 \NormalTok{   pa.nrpatients }\KeywordTok{AS}\NormalTok{ patients,}
-   \FunctionTok{round}\NormalTok{((((}\DecValTok{100}\NormalTok{):}\CharTok{:numeric} \OperatorTok{*}\NormalTok{ (ar.count\_value):}\CharTok{:numeric}\NormalTok{) }\OperatorTok{/}\NormalTok{ (pa.nrpatients):}\CharTok{:numeric}\NormalTok{), }\DecValTok{2}\NormalTok{) }\KeywordTok{AS}\NormalTok{ percentage}
+   \FunctionTok{round}\NormalTok{(}
+\NormalTok{     (}
+\NormalTok{       ((}\DecValTok{100}\NormalTok{):}\CharTok{:numeric} \OperatorTok{*}\NormalTok{ (ar.count\_value):}\CharTok{:numeric}\NormalTok{)}
+       \OperatorTok{/}
+\NormalTok{       (pa.nrpatients):}\CharTok{:numeric}
+\NormalTok{     ),}
+     \DecValTok{2}
+\NormalTok{   ) }\KeywordTok{AS}\NormalTok{ percentage}
   \KeywordTok{FROM}\NormalTok{ (((achilles\_results ar}
     \KeywordTok{JOIN}\NormalTok{ data\_source ds }\KeywordTok{ON}\NormalTok{ ((ds.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ ar.data\_source\_id)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((ds.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ ( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.count\_value }\KeywordTok{AS}\NormalTok{ nrpatients,}
 \NormalTok{           achilles\_results.data\_source\_id}
           \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{0}\NormalTok{)) pa }\KeywordTok{ON}\NormalTok{ ((pa.data\_source\_id }\OperatorTok{=}\NormalTok{ ds.}\KeywordTok{id}\NormalTok{)))}
+         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{0}\NormalTok{)) pa}
+           \KeywordTok{ON}\NormalTok{ ((pa.data\_source\_id }\OperatorTok{=}\NormalTok{ ds.}\KeywordTok{id}\NormalTok{)))}
  \KeywordTok{WHERE}\NormalTok{ (ar.analysis\_id }\OperatorTok{=} \DecValTok{113}\NormalTok{);}
 \end{Highlighting}
 \end{Shaded}
@@ -2621,7 +2744,8 @@ \subsection*{length\_of\_observation\_of\_first\_observation\_period}\label{leng
 \NormalTok{   achilles.p90\_value }\KeywordTok{AS}\NormalTok{ p90,}
 \NormalTok{   achilles.max\_value}
   \KeywordTok{FROM}\NormalTok{ ((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((}\KeywordTok{source}\NormalTok{.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}\NormalTok{)))}
  \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{105}\NormalTok{)}
  \KeywordTok{ORDER} \KeywordTok{BY} \KeywordTok{source}\NormalTok{.name;}
@@ -2659,10 +2783,17 @@ \subsection*{visit\_type\_bar\_chart}\label{visit_type_bar_chart}}
 \NormalTok{           achilles\_results\_1.p90\_value,}
 \NormalTok{           achilles\_results\_1.stdev\_value}
           \KeywordTok{FROM}\NormalTok{ achilles\_results achilles\_results\_1}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results\_1.analysis\_id }\OperatorTok{=} \DecValTok{200}\NormalTok{)) achilles\_results}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{ON}\NormalTok{ ((achilles\_results.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{)))}
+         \KeywordTok{WHERE}\NormalTok{ (achilles\_results\_1.analysis\_id }\OperatorTok{=} \DecValTok{200}\NormalTok{)}
+\NormalTok{         ) achilles\_results}
+    \KeywordTok{JOIN}\NormalTok{ data\_source}
+      \KeywordTok{ON}\NormalTok{ ((achilles\_results.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}\NormalTok{)))}
     \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ data\_source.country\_id)))}
-    \KeywordTok{JOIN}\NormalTok{ concept }\KeywordTok{ON}\NormalTok{ (((achilles\_results.stratum\_1):}\CharTok{:integer} \OperatorTok{=}\NormalTok{ concept.concept\_id)));}
+    \KeywordTok{JOIN}\NormalTok{ concept}
+      \KeywordTok{ON}
+\NormalTok{        (achilles\_results.stratum\_1):}\CharTok{:integer}
+        \OperatorTok{=}
+\NormalTok{        concept.concept\_id}
+\NormalTok{        );}
 \end{Highlighting}
 \end{Shaded}
 
@@ -2678,8 +2809,22 @@ \subsection*{visit\_type\_table}\label{visit_type_table}}
 \NormalTok{   country.country,}
 \NormalTok{   concept.concept\_name,}
 \NormalTok{   ar1.count\_value }\KeywordTok{AS}\NormalTok{ num\_persons,}
-   \FunctionTok{round}\NormalTok{(((}\FloatTok{100.0} \OperatorTok{*}\NormalTok{ (ar1.count\_value):}\CharTok{:numeric}\NormalTok{) }\OperatorTok{/}\NormalTok{ (denom.count\_value):}\CharTok{:numeric}\NormalTok{), }\DecValTok{2}\NormalTok{) }\KeywordTok{AS}\NormalTok{ percent\_persons,}
-   \FunctionTok{round}\NormalTok{(((}\FloatTok{1.0} \OperatorTok{*}\NormalTok{ (ar2.count\_value):}\CharTok{:numeric}\NormalTok{) }\OperatorTok{/}\NormalTok{ (ar1.count\_value):}\CharTok{:numeric}\NormalTok{), }\DecValTok{2}\NormalTok{) }\KeywordTok{AS}\NormalTok{ records\_per\_person}
+   \FunctionTok{round}\NormalTok{(}
+\NormalTok{     (}
+\NormalTok{       (}\FloatTok{100.0} \OperatorTok{*}\NormalTok{ (ar1.count\_value):}\CharTok{:numeric}\NormalTok{)}
+       \OperatorTok{/}
+\NormalTok{       (denom.count\_value):}\CharTok{:numeric}
+\NormalTok{     ),}
+     \DecValTok{2}
+\NormalTok{   ) }\KeywordTok{AS}\NormalTok{ percent\_persons,}
+   \FunctionTok{round}\NormalTok{(}
+\NormalTok{     (}
+\NormalTok{       (}\FloatTok{1.0} \OperatorTok{*}\NormalTok{ (ar2.count\_value):}\CharTok{:numeric}\NormalTok{)}
+       \OperatorTok{/}
+\NormalTok{       (ar1.count\_value):}\CharTok{:numeric}
+\NormalTok{     ),}
+     \DecValTok{2}
+\NormalTok{   ) }\KeywordTok{AS}\NormalTok{ records\_per\_person}
   \KeywordTok{FROM}\NormalTok{ (((((( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.}\KeywordTok{id}\NormalTok{,}
 \NormalTok{           achilles\_results.analysis\_id,}
 \NormalTok{           achilles\_results.stratum\_1,}
@@ -2719,7 +2864,9 @@ \subsection*{visit\_type\_table}\label{visit_type_table}}
 \NormalTok{           achilles\_results.p90\_value,}
 \NormalTok{           achilles\_results.stdev\_value}
           \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{201}\NormalTok{)) ar2 }\KeywordTok{ON}\NormalTok{ (((ar1.stratum\_1 }\OperatorTok{=}\NormalTok{ ar2.stratum\_1) }\KeywordTok{AND}\NormalTok{ (ar1.data\_source\_id }\OperatorTok{=}\NormalTok{ ar2.data\_source\_id))))}
+         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{201}\NormalTok{)) ar2}
+           \KeywordTok{ON}\NormalTok{ (((ar1.stratum\_1 }\OperatorTok{=}\NormalTok{ ar2.stratum\_1)}
+             \KeywordTok{AND}\NormalTok{ (ar1.data\_source\_id }\OperatorTok{=}\NormalTok{ ar2.data\_source\_id))))}
     \KeywordTok{JOIN}\NormalTok{ ( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.}\KeywordTok{id}\NormalTok{,}
 \NormalTok{           achilles\_results.analysis\_id,}
 \NormalTok{           achilles\_results.stratum\_1,}
@@ -2739,10 +2886,13 @@ \subsection*{visit\_type\_table}\label{visit_type_table}}
 \NormalTok{           achilles\_results.p90\_value,}
 \NormalTok{           achilles\_results.stdev\_value}
           \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{1}\NormalTok{)) denom }\KeywordTok{ON}\NormalTok{ ((ar1.data\_source\_id }\OperatorTok{=}\NormalTok{ denom.data\_source\_id)))}
+         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{1}\NormalTok{)) denom}
+           \KeywordTok{ON}\NormalTok{ ((ar1.data\_source\_id }\OperatorTok{=}\NormalTok{ denom.data\_source\_id)))}
     \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{ON}\NormalTok{ ((data\_source.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ ar1.data\_source\_id)))}
-    \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ data\_source.country\_id)))}
-    \KeywordTok{JOIN}\NormalTok{ concept }\KeywordTok{ON}\NormalTok{ (((ar1.stratum\_1):}\CharTok{:integer} \OperatorTok{=}\NormalTok{ concept.concept\_id)))}
+    \KeywordTok{JOIN}\NormalTok{ country}
+      \KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ data\_source.country\_id)))}
+    \KeywordTok{JOIN}\NormalTok{ concept}
+      \KeywordTok{ON}\NormalTok{ (((ar1.stratum\_1):}\CharTok{:integer} \OperatorTok{=}\NormalTok{ concept.concept\_id)))}
  \KeywordTok{ORDER} \KeywordTok{BY}\NormalTok{ ar1.data\_source\_id, ar1.count\_value }\KeywordTok{DESC}\NormalTok{;}
 \end{Highlighting}
 \end{Shaded}
@@ -2753,17 +2903,55 @@ \subsection*{domain\_filter}\label{domain_filter}}
 
 \begin{Shaded}
 \begin{Highlighting}[]
-\KeywordTok{SELECT}\NormalTok{ concept.concept\_name,}
-\NormalTok{   concept.domain\_id,}
-   \KeywordTok{source}\NormalTok{.name,}
-   \KeywordTok{source}\NormalTok{.acronym,}
-   \KeywordTok{source}\NormalTok{.database\_type,}
-\NormalTok{   country.country}
-  \KeywordTok{FROM}\NormalTok{ (((achilles\_results}
-    \KeywordTok{JOIN}\NormalTok{ concept }\KeywordTok{ON}\NormalTok{ (((achilles\_results.stratum\_1):}\CharTok{:bigint} \OperatorTok{=}\NormalTok{ concept.concept\_id)))}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles\_results.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
-    \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)))}
- \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{201}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{401}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{601}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{701}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{901}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1001}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{200}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{400}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{600}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{700}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{800}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1800}\NormalTok{):}\CharTok{:bigint}\NormalTok{]));}
+\KeywordTok{SELECT}
+\NormalTok{  concept.concept\_name,}
+\NormalTok{  concept.domain\_id,}
+  \KeywordTok{source}\NormalTok{.name,}
+  \KeywordTok{source}\NormalTok{.acronym,}
+  \KeywordTok{source}\NormalTok{.database\_type,}
+\NormalTok{  country.country}
+\KeywordTok{FROM}
+\NormalTok{  (}
+\NormalTok{    (}
+\NormalTok{      (}
+\NormalTok{        achilles\_results}
+        \KeywordTok{JOIN}\NormalTok{ concept }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{          (}
+\NormalTok{            (achilles\_results.stratum\_1):: bigint}
+            \OperatorTok{=}
+\NormalTok{            concept.concept\_id}
+\NormalTok{          )}
+\NormalTok{        )}
+\NormalTok{      )}
+      \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ (}
+\NormalTok{        (}
+\NormalTok{          achilles\_results.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\NormalTok{        )}
+\NormalTok{      )}
+\NormalTok{    )}
+    \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{      (country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)}
+\NormalTok{    )}
+\NormalTok{  )}
+\KeywordTok{WHERE}
+\NormalTok{  (}
+\NormalTok{    achilles\_results.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+      \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{201}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{401}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{601}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{701}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{801}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{901}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{1001}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{1801}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{200}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{400}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{600}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{700}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{800}\NormalTok{):: bigint,}
+\NormalTok{      (}\DecValTok{1800}\NormalTok{):: bigint]}
+\NormalTok{    )}
+\NormalTok{  );}
 \end{Highlighting}
 \end{Shaded}
 
@@ -2773,31 +2961,96 @@ \subsection*{concept\_browser\_table3}\label{concept_browser_table3}}
 
 \begin{Shaded}
 \begin{Highlighting}[]
-\KeywordTok{SELECT} \KeywordTok{source}\NormalTok{.name,}
-   \KeywordTok{source}\NormalTok{.acronym,}
-   \KeywordTok{source}\NormalTok{.database\_type,}
-\NormalTok{   country.country,}
-\NormalTok{   ((((}\StringTok{\textquotesingle{}\textless{}a href="https://athena.ohdsi.org/search{-}terms/terms/\textquotesingle{}}\NormalTok{:}\CharTok{:text} \OperatorTok{||}\NormalTok{ ar1.concept\_id) }\OperatorTok{||} \StringTok{\textquotesingle{}"target="\_blank"\textgreater{}\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{) }\OperatorTok{||}\NormalTok{ ar1.concept\_id) }\OperatorTok{||} \StringTok{\textquotesingle{}\textless{}/a\textgreater{}\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{) }\KeywordTok{AS}\NormalTok{ concept\_id,}
-\NormalTok{   concept.concept\_name,}
-\NormalTok{   concept.domain\_id,}
-\NormalTok{   (ar1.rc):}\CharTok{:integer} \KeywordTok{AS}\NormalTok{ rc,}
-\NormalTok{   (ar2.drc):}\CharTok{:integer} \KeywordTok{AS}\NormalTok{ drc}
-  \KeywordTok{FROM}\NormalTok{ ((((( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.data\_source\_id,}
-\NormalTok{           achilles\_results.analysis\_id,}
-\NormalTok{           achilles\_results.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
-\NormalTok{           achilles\_results.count\_value }\KeywordTok{AS}\NormalTok{ rc}
-          \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{401}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{601}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{701}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2101}\NormalTok{):}\CharTok{:bigint}\NormalTok{]))) ar1}
-    \KeywordTok{JOIN}\NormalTok{ ( }\KeywordTok{SELECT}\NormalTok{ ar.data\_source\_id,}
-\NormalTok{           ar.analysis\_id,}
-\NormalTok{           ar.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
-\NormalTok{           ar.count\_value }\KeywordTok{AS}\NormalTok{ drc}
-          \KeywordTok{FROM}\NormalTok{ achilles\_results ar}
-         \KeywordTok{WHERE}\NormalTok{ (ar.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{430}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{630}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{730}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{830}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1830}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2130}\NormalTok{):}\CharTok{:bigint}\NormalTok{]))) ar2 }\KeywordTok{ON}\NormalTok{ (((ar1.concept\_id }\OperatorTok{=}\NormalTok{ ar2.concept\_id) }\KeywordTok{AND}\NormalTok{ (ar1.data\_source\_id }\OperatorTok{=}\NormalTok{ ar2.data\_source\_id))))}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((ar1.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
-    \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((}\KeywordTok{source}\NormalTok{.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}\NormalTok{)))}
-    \KeywordTok{JOIN}\NormalTok{ concept concept }\KeywordTok{ON}\NormalTok{ ((ar1.concept\_id }\OperatorTok{=}\NormalTok{ (concept.concept\_id):}\CharTok{:text}\NormalTok{)))}
- \KeywordTok{ORDER} \KeywordTok{BY}\NormalTok{ ((ar2.drc):}\CharTok{:integer}\NormalTok{) }\KeywordTok{DESC}\NormalTok{;}
+\KeywordTok{SELECT}
+  \KeywordTok{source}\NormalTok{.name,}
+  \KeywordTok{source}\NormalTok{.acronym,}
+  \KeywordTok{source}\NormalTok{.database\_type,}
+\NormalTok{  country.country,}
+\NormalTok{  (}
+\NormalTok{    (}
+\NormalTok{      (}
+\NormalTok{        (}
+\StringTok{\textquotesingle{}\textless{}a href="https://athena.ohdsi.org/search{-}terms/terms/\textquotesingle{}}\NormalTok{ :: text}
+          \OperatorTok{||}\NormalTok{ ar1.concept\_id}
+\NormalTok{        ) }\OperatorTok{||} \StringTok{\textquotesingle{}"target="\_blank"\textgreater{}\textquotesingle{}}\NormalTok{ :: text}
+\NormalTok{      ) }\OperatorTok{||}\NormalTok{ ar1.concept\_id}
+\NormalTok{    ) }\OperatorTok{||} \StringTok{\textquotesingle{}\textless{}/a\textgreater{}\textquotesingle{}}\NormalTok{ :: text}
+\NormalTok{  ) }\KeywordTok{AS}\NormalTok{ concept\_id,}
+\NormalTok{  concept.concept\_name,}
+\NormalTok{  concept.domain\_id,}
+\NormalTok{  (ar1.rc):: }\DataTypeTok{integer} \KeywordTok{AS}\NormalTok{ rc,}
+\NormalTok{  (ar2.drc):: }\DataTypeTok{integer} \KeywordTok{AS}\NormalTok{ drc}
+\KeywordTok{FROM}
+\NormalTok{  (}
+\NormalTok{    (}
+\NormalTok{      (}
+\NormalTok{        (}
+\NormalTok{          (}
+            \KeywordTok{SELECT}
+\NormalTok{              achilles\_results.data\_source\_id,}
+\NormalTok{              achilles\_results.analysis\_id,}
+\NormalTok{              achilles\_results.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
+\NormalTok{              achilles\_results.count\_value }\KeywordTok{AS}\NormalTok{ rc}
+            \KeywordTok{FROM}
+\NormalTok{              achilles\_results}
+            \KeywordTok{WHERE}
+\NormalTok{              (}
+\NormalTok{                achilles\_results.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+                  \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{401}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{601}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{701}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{801}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{1801}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{2101}\NormalTok{):: bigint]}
+\NormalTok{                )}
+\NormalTok{              )}
+\NormalTok{          ) ar1}
+          \KeywordTok{JOIN}\NormalTok{ (}
+            \KeywordTok{SELECT}
+\NormalTok{              ar.data\_source\_id,}
+\NormalTok{              ar.analysis\_id,}
+\NormalTok{              ar.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
+\NormalTok{              ar.count\_value }\KeywordTok{AS}\NormalTok{ drc}
+            \KeywordTok{FROM}
+\NormalTok{              achilles\_results ar}
+            \KeywordTok{WHERE}
+\NormalTok{              (}
+\NormalTok{                ar.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+                  \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{430}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{630}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{730}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{830}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{1830}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{2130}\NormalTok{):: bigint]}
+\NormalTok{                )}
+\NormalTok{              )}
+\NormalTok{          ) ar2 }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{            (}
+\NormalTok{              (ar1.concept\_id }\OperatorTok{=}\NormalTok{ ar2.concept\_id)}
+              \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{                ar1.data\_source\_id }\OperatorTok{=}\NormalTok{ ar2.data\_source\_id}
+\NormalTok{              )}
+\NormalTok{            )}
+\NormalTok{          )}
+\NormalTok{        )}
+        \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ (}
+\NormalTok{          (ar1.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)}
+\NormalTok{        )}
+\NormalTok{      )}
+      \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{        (}\KeywordTok{source}\NormalTok{.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}\NormalTok{)}
+\NormalTok{      )}
+\NormalTok{    )}
+    \KeywordTok{JOIN}\NormalTok{ concept concept }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{      (}
+\NormalTok{        ar1.concept\_id }\OperatorTok{=}\NormalTok{ (concept.concept\_id):: text}
+\NormalTok{      )}
+\NormalTok{    )}
+\NormalTok{  )}
+\KeywordTok{ORDER} \KeywordTok{BY}
+\NormalTok{  (}
+\NormalTok{    (ar2.drc):: }\DataTypeTok{integer}
+\NormalTok{  ) }\KeywordTok{DESC}\NormalTok{;}
 \end{Highlighting}
 \end{Shaded}
 
@@ -2807,30 +3060,102 @@ \subsection*{concept\_coverage2}\label{concept_coverage2}}
 
 \begin{Shaded}
 \begin{Highlighting}[]
-\KeywordTok{SELECT} \KeywordTok{source}\NormalTok{.name }\KeywordTok{AS}\NormalTok{ source\_name,}
-   \KeywordTok{source}\NormalTok{.database\_type,}
-\NormalTok{   country.country,}
-\NormalTok{   ((((}\StringTok{\textquotesingle{}\textless{}a href="https://athena.ohdsi.org/search{-}terms/terms/\textquotesingle{}}\NormalTok{:}\CharTok{:text} \OperatorTok{||}\NormalTok{ concept.concept\_id) }\OperatorTok{||} \StringTok{\textquotesingle{}" target="\_blank"\textgreater{}\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{) }\OperatorTok{||}\NormalTok{ concept.concept\_id) }\OperatorTok{||} \StringTok{\textquotesingle{}\textless{}/a\textgreater{}\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{) }\KeywordTok{AS}\NormalTok{ concept\_id,}
-\NormalTok{   concept.concept\_name,}
-\NormalTok{   concept.domain\_id,}
-   \FunctionTok{sum}\NormalTok{((ar1.rc):}\CharTok{:integer}\NormalTok{) }\KeywordTok{AS}\NormalTok{ rc,}
-   \FunctionTok{sum}\NormalTok{((ar2.drc):}\CharTok{:integer}\NormalTok{) }\KeywordTok{AS}\NormalTok{ drc}
-  \KeywordTok{FROM}\NormalTok{ ((((( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.data\_source\_id,}
-\NormalTok{           achilles\_results.analysis\_id,}
-\NormalTok{           achilles\_results.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
-\NormalTok{           achilles\_results.count\_value }\KeywordTok{AS}\NormalTok{ rc}
-          \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{401}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{601}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{701}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2101}\NormalTok{):}\CharTok{:bigint}\NormalTok{]))) ar1}
-    \KeywordTok{JOIN}\NormalTok{ ( }\KeywordTok{SELECT}\NormalTok{ ar.data\_source\_id,}
-\NormalTok{           ar.analysis\_id,}
-\NormalTok{           ar.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
-\NormalTok{           ar.count\_value }\KeywordTok{AS}\NormalTok{ drc}
-          \KeywordTok{FROM}\NormalTok{ achilles\_results ar}
-         \KeywordTok{WHERE}\NormalTok{ (ar.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{430}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{630}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{730}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{830}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1830}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2130}\NormalTok{):}\CharTok{:bigint}\NormalTok{]))) ar2 }\KeywordTok{ON}\NormalTok{ (((ar1.concept\_id }\OperatorTok{=}\NormalTok{ ar2.concept\_id) }\KeywordTok{AND}\NormalTok{ (ar1.data\_source\_id }\OperatorTok{=}\NormalTok{ ar2.data\_source\_id))))}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((ar1.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
-    \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ ((country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)))}
-    \KeywordTok{JOIN}\NormalTok{ concept concept }\KeywordTok{ON}\NormalTok{ ((ar1.concept\_id }\OperatorTok{=}\NormalTok{ (concept.concept\_id):}\CharTok{:text}\NormalTok{)))}
- \KeywordTok{GROUP} \KeywordTok{BY} \KeywordTok{source}\NormalTok{.name, }\KeywordTok{source}\NormalTok{.database\_type, country.country, concept.domain\_id, concept.concept\_id, concept.concept\_name;}
+\KeywordTok{SELECT}
+  \KeywordTok{source}\NormalTok{.name }\KeywordTok{AS}\NormalTok{ source\_name,}
+  \KeywordTok{source}\NormalTok{.database\_type,}
+\NormalTok{  country.country,}
+\NormalTok{  (}
+\NormalTok{    (}
+\NormalTok{      (}
+\NormalTok{        (}
+\StringTok{\textquotesingle{}\textless{}a href="https://athena.ohdsi.org/search{-}terms/terms/\textquotesingle{}}\NormalTok{ :: text}
+          \OperatorTok{||}\NormalTok{ concept.concept\_id}
+\NormalTok{        ) }\OperatorTok{||} \StringTok{\textquotesingle{}" target="\_blank"\textgreater{}\textquotesingle{}}\NormalTok{ :: text}
+\NormalTok{      ) }\OperatorTok{||}\NormalTok{ concept.concept\_id}
+\NormalTok{    ) }\OperatorTok{||} \StringTok{\textquotesingle{}\textless{}/a\textgreater{}\textquotesingle{}}\NormalTok{ :: text}
+\NormalTok{  ) }\KeywordTok{AS}\NormalTok{ concept\_id,}
+\NormalTok{  concept.concept\_name,}
+\NormalTok{  concept.domain\_id,}
+  \FunctionTok{sum}\NormalTok{(}
+\NormalTok{    (ar1.rc):: }\DataTypeTok{integer}
+\NormalTok{  ) }\KeywordTok{AS}\NormalTok{ rc,}
+  \FunctionTok{sum}\NormalTok{(}
+\NormalTok{    (ar2.drc):: }\DataTypeTok{integer}
+\NormalTok{  ) }\KeywordTok{AS}\NormalTok{ drc}
+\KeywordTok{FROM}
+\NormalTok{  (}
+\NormalTok{    (}
+\NormalTok{      (}
+\NormalTok{        (}
+\NormalTok{          (}
+            \KeywordTok{SELECT}
+\NormalTok{              achilles\_results.data\_source\_id,}
+\NormalTok{              achilles\_results.analysis\_id,}
+\NormalTok{              achilles\_results.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
+\NormalTok{              achilles\_results.count\_value }\KeywordTok{AS}\NormalTok{ rc}
+            \KeywordTok{FROM}
+\NormalTok{              achilles\_results}
+            \KeywordTok{WHERE}
+\NormalTok{              (}
+\NormalTok{                achilles\_results.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+                  \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{401}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{601}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{701}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{801}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{1801}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{2101}\NormalTok{):: bigint]}
+\NormalTok{                )}
+\NormalTok{              )}
+\NormalTok{          ) ar1}
+          \KeywordTok{JOIN}\NormalTok{ (}
+            \KeywordTok{SELECT}
+\NormalTok{              ar.data\_source\_id,}
+\NormalTok{              ar.analysis\_id,}
+\NormalTok{              ar.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
+\NormalTok{              ar.count\_value }\KeywordTok{AS}\NormalTok{ drc}
+            \KeywordTok{FROM}
+\NormalTok{              achilles\_results ar}
+            \KeywordTok{WHERE}
+\NormalTok{              (}
+\NormalTok{                ar.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+                  \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{430}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{630}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{730}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{830}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{1830}\NormalTok{):: bigint,}
+\NormalTok{                  (}\DecValTok{2130}\NormalTok{):: bigint]}
+\NormalTok{                )}
+\NormalTok{              )}
+\NormalTok{          ) ar2 }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{            (}
+\NormalTok{              (ar1.concept\_id }\OperatorTok{=}\NormalTok{ ar2.concept\_id)}
+              \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{                ar1.data\_source\_id }\OperatorTok{=}\NormalTok{ ar2.data\_source\_id}
+\NormalTok{              )}
+\NormalTok{            )}
+\NormalTok{          )}
+\NormalTok{        )}
+        \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ (}
+\NormalTok{          (ar1.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)}
+\NormalTok{        )}
+\NormalTok{      )}
+      \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{        (country.}\KeywordTok{id} \OperatorTok{=} \KeywordTok{source}\NormalTok{.country\_id)}
+\NormalTok{      )}
+\NormalTok{    )}
+    \KeywordTok{JOIN}\NormalTok{ concept concept }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{      (}
+\NormalTok{        ar1.concept\_id }\OperatorTok{=}\NormalTok{ (concept.concept\_id):: text}
+\NormalTok{      )}
+\NormalTok{    )}
+\NormalTok{  )}
+\KeywordTok{GROUP} \KeywordTok{BY}
+  \KeywordTok{source}\NormalTok{.name,}
+  \KeywordTok{source}\NormalTok{.database\_type,}
+\NormalTok{  country.country,}
+\NormalTok{  concept.domain\_id,}
+\NormalTok{  concept.concept\_id,}
+\NormalTok{  concept.concept\_name;}
 \end{Highlighting}
 \end{Shaded}
 
@@ -2923,7 +3248,8 @@ \subsection*{data\_density}\label{data_density}}
     \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((}\KeywordTok{source}\NormalTok{.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ t1.}\KeywordTok{id}\NormalTok{)))}
  \KeywordTok{ORDER} \KeywordTok{BY}\NormalTok{ t1.table\_name, (}
        \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (t1.stratum\_1 \textasciitilde{} }\StringTok{\textquotesingle{}\^{}\textbackslash{}d+\textbackslash{}.?\textbackslash{}d+$\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{) }\ControlFlowTok{THEN}\NormalTok{ t1.stratum\_1}
+           \ControlFlowTok{WHEN}\NormalTok{ (t1.stratum\_1 \textasciitilde{} }\StringTok{\textquotesingle{}\^{}\textbackslash{}d+\textbackslash{}.?\textbackslash{}d+$\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{)}
+             \ControlFlowTok{THEN}\NormalTok{ t1.stratum\_1}
            \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:text}
        \ControlFlowTok{END}\NormalTok{):}\CharTok{:integer}\NormalTok{;}
 \end{Highlighting}
@@ -2938,7 +3264,14 @@ \subsection*{records\_per\_person}\label{records_per_person}}
 \KeywordTok{SELECT} \KeywordTok{source}\NormalTok{.acronym,}
 \NormalTok{   t1.table\_name }\KeywordTok{AS}\NormalTok{ series\_name,}
    \FunctionTok{to\_date}\NormalTok{(t1.stratum\_1, }\StringTok{\textquotesingle{}YYYYMM\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{) }\KeywordTok{AS}\NormalTok{ x\_calendar\_month,}
-   \FunctionTok{round}\NormalTok{(((}\FloatTok{1.0} \OperatorTok{*}\NormalTok{ (t1.count\_value):}\CharTok{:numeric}\NormalTok{) }\OperatorTok{/}\NormalTok{ (denom.count\_value):}\CharTok{:numeric}\NormalTok{), }\DecValTok{5}\NormalTok{) }\KeywordTok{AS}\NormalTok{ y\_record\_count}
+   \FunctionTok{round}\NormalTok{(}
+\NormalTok{     (}
+\NormalTok{       (}\FloatTok{1.0} \OperatorTok{*}\NormalTok{ (t1.count\_value):}\CharTok{:numeric}\NormalTok{)}
+       \OperatorTok{/}
+\NormalTok{       (denom.count\_value):}\CharTok{:numeric}
+\NormalTok{     ),}
+     \DecValTok{5}
+\NormalTok{   ) }\KeywordTok{AS}\NormalTok{ y\_record\_count}
   \KeywordTok{FROM}\NormalTok{ ((( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.data\_source\_id }\KeywordTok{AS} \KeywordTok{id}\NormalTok{,}
            \StringTok{\textquotesingle{}Visit occurrence\textquotesingle{}}\NormalTok{:}\CharTok{:text} \KeywordTok{AS}\NormalTok{ table\_name,}
 \NormalTok{           achilles\_results.stratum\_1,}
@@ -3034,11 +3367,14 @@ \subsection*{records\_per\_person}\label{records_per_person}}
 \NormalTok{           achilles\_results.p90\_value,}
 \NormalTok{           achilles\_results.stdev\_value}
           \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{117}\NormalTok{)) denom }\KeywordTok{ON}\NormalTok{ (((t1.stratum\_1 }\OperatorTok{=}\NormalTok{ denom.stratum\_1) }\KeywordTok{AND}\NormalTok{ (t1.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ denom.data\_source\_id))))}
+         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \DecValTok{117}\NormalTok{)) denom}
+           \KeywordTok{ON}\NormalTok{ (((t1.stratum\_1 }\OperatorTok{=}\NormalTok{ denom.stratum\_1)}
+             \KeywordTok{AND}\NormalTok{ (t1.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ denom.data\_source\_id))))}
     \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((}\KeywordTok{source}\NormalTok{.}\KeywordTok{id} \OperatorTok{=}\NormalTok{ t1.}\KeywordTok{id}\NormalTok{)))}
  \KeywordTok{ORDER} \KeywordTok{BY}\NormalTok{ t1.table\_name, (}
        \ControlFlowTok{CASE}
-           \ControlFlowTok{WHEN}\NormalTok{ (t1.stratum\_1 \textasciitilde{} }\StringTok{\textquotesingle{}\^{}\textbackslash{}d+\textbackslash{}.?\textbackslash{}d+$\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{) }\ControlFlowTok{THEN}\NormalTok{ t1.stratum\_1}
+           \ControlFlowTok{WHEN}\NormalTok{ (t1.stratum\_1 \textasciitilde{} }\StringTok{\textquotesingle{}\^{}\textbackslash{}d+\textbackslash{}.?\textbackslash{}d+$\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{)}
+             \ControlFlowTok{THEN}\NormalTok{ t1.stratum\_1}
            \ControlFlowTok{ELSE} \KeywordTok{NULL}\NormalTok{:}\CharTok{:text}
        \ControlFlowTok{END}\NormalTok{):}\CharTok{:integer}\NormalTok{;}
 \end{Highlighting}
@@ -3061,9 +3397,12 @@ \subsection*{visit\_age\_distribution}\label{visit_age_distribution}}
 \NormalTok{   achilles.p75\_value }\KeywordTok{AS}\NormalTok{ p75,}
 \NormalTok{   achilles.p90\_value }\KeywordTok{AS}\NormalTok{ p90}
   \KeywordTok{FROM}\NormalTok{ (((achilles\_results achilles}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
-    \KeywordTok{JOIN}\NormalTok{ concept c1 }\KeywordTok{ON}\NormalTok{ ((achilles.stratum\_1 }\OperatorTok{=}\NormalTok{ (c1.concept\_id):}\CharTok{:text}\NormalTok{)))}
-    \KeywordTok{JOIN}\NormalTok{ concept c2 }\KeywordTok{ON}\NormalTok{ ((achilles.stratum\_2 }\OperatorTok{=}\NormalTok{ (c2.concept\_id):}\CharTok{:text}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ ((achilles.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ concept c1}
+      \KeywordTok{ON}\NormalTok{ ((achilles.stratum\_1 }\OperatorTok{=}\NormalTok{ (c1.concept\_id):}\CharTok{:text}\NormalTok{)))}
+    \KeywordTok{JOIN}\NormalTok{ concept c2}
+      \KeywordTok{ON}\NormalTok{ ((achilles.stratum\_2 }\OperatorTok{=}\NormalTok{ (c2.concept\_id):}\CharTok{:text}\NormalTok{)))}
  \KeywordTok{WHERE}\NormalTok{ (achilles.analysis\_id }\OperatorTok{=} \DecValTok{206}\NormalTok{)}
  \KeywordTok{ORDER} \KeywordTok{BY} \KeywordTok{source}\NormalTok{.name, c1.concept\_name, c2.concept\_name;}
 \end{Highlighting}
@@ -3076,27 +3415,84 @@ \subsection*{concept\_browser\_table2}\label{concept_browser_table2}}
 \begin{Shaded}
 \begin{Highlighting}[]
 \KeywordTok{SELECT}
-   \KeywordTok{source}\NormalTok{.acronym,}
-\NormalTok{   ((((}\StringTok{\textquotesingle{}\textless{}a href="https://athena.ohdsi.org/search{-}terms/terms/\textquotesingle{}}\NormalTok{:}\CharTok{:text} \OperatorTok{||}\NormalTok{ ar1.concept\_id) }\OperatorTok{||} \StringTok{\textquotesingle{}"target="\_blank"\textgreater{}\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{) }\OperatorTok{||}\NormalTok{ ar1.concept\_id) }\OperatorTok{||} \StringTok{\textquotesingle{}\textless{}/a\textgreater{}\textquotesingle{}}\NormalTok{:}\CharTok{:text}\NormalTok{) }\KeywordTok{AS}\NormalTok{ concept\_id,}
-\NormalTok{   concept.concept\_name,}
-\NormalTok{   concept.domain\_id,}
-\NormalTok{   (ar1.rc):}\CharTok{:integer} \KeywordTok{AS}\NormalTok{ rc,}
-\NormalTok{   (ar2.drc):}\CharTok{:integer} \KeywordTok{AS}\NormalTok{ drc}
-  \KeywordTok{FROM}\NormalTok{ (((( }\KeywordTok{SELECT}\NormalTok{ achilles\_results.data\_source\_id,}
-\NormalTok{           achilles\_results.analysis\_id,}
-\NormalTok{           achilles\_results.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
-\NormalTok{           achilles\_results.count\_value }\KeywordTok{AS}\NormalTok{ rc}
-          \KeywordTok{FROM}\NormalTok{ achilles\_results}
-         \KeywordTok{WHERE}\NormalTok{ (achilles\_results.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{401}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{601}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{701}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1801}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2101}\NormalTok{):}\CharTok{:bigint}\NormalTok{]))) ar1}
-    \KeywordTok{JOIN}\NormalTok{ ( }\KeywordTok{SELECT}\NormalTok{ ar.data\_source\_id,}
-\NormalTok{           ar.analysis\_id,}
-\NormalTok{           ar.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
-\NormalTok{           ar.count\_value }\KeywordTok{AS}\NormalTok{ drc}
-          \KeywordTok{FROM}\NormalTok{ achilles\_results ar}
-         \KeywordTok{WHERE}\NormalTok{ (ar.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}\DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{430}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{630}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{730}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{830}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{1830}\NormalTok{):}\CharTok{:bigint}\NormalTok{, (}\DecValTok{2130}\NormalTok{):}\CharTok{:bigint}\NormalTok{]))) ar2 }\KeywordTok{ON}\NormalTok{ (((ar1.concept\_id }\OperatorTok{=}\NormalTok{ ar2.concept\_id) }\KeywordTok{AND}\NormalTok{ (ar1.data\_source\_id }\OperatorTok{=}\NormalTok{ ar2.data\_source\_id))))}
-    \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ ((ar1.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)))}
-    \KeywordTok{JOIN}\NormalTok{ concept concept }\KeywordTok{ON}\NormalTok{ ((ar1.concept\_id }\OperatorTok{=}\NormalTok{ (concept.concept\_id):}\CharTok{:text}\NormalTok{)))}
- \KeywordTok{ORDER} \KeywordTok{BY}\NormalTok{ ((ar2.drc):}\CharTok{:integer}\NormalTok{) }\KeywordTok{DESC}\NormalTok{;}
+  \KeywordTok{source}\NormalTok{.acronym,}
+\NormalTok{  (}
+\NormalTok{    (}
+\NormalTok{      (}
+\NormalTok{        (}
+\StringTok{\textquotesingle{}\textless{}a href="https://athena.ohdsi.org/search{-}terms/terms/\textquotesingle{}}\NormalTok{ :: text}
+          \OperatorTok{||}\NormalTok{ ar1.concept\_id}
+\NormalTok{        ) }\OperatorTok{||} \StringTok{\textquotesingle{}"target="\_blank"\textgreater{}\textquotesingle{}}\NormalTok{ :: text}
+\NormalTok{      ) }\OperatorTok{||}\NormalTok{ ar1.concept\_id}
+\NormalTok{    ) }\OperatorTok{||} \StringTok{\textquotesingle{}\textless{}/a\textgreater{}\textquotesingle{}}\NormalTok{ :: text}
+\NormalTok{  ) }\KeywordTok{AS}\NormalTok{ concept\_id,}
+\NormalTok{  concept.concept\_name,}
+\NormalTok{  concept.domain\_id,}
+\NormalTok{  (ar1.rc):: }\DataTypeTok{integer} \KeywordTok{AS}\NormalTok{ rc,}
+\NormalTok{  (ar2.drc):: }\DataTypeTok{integer} \KeywordTok{AS}\NormalTok{ drc}
+\KeywordTok{FROM}
+\NormalTok{  (}
+\NormalTok{    (}
+\NormalTok{      (}
+\NormalTok{        (}
+          \KeywordTok{SELECT}
+\NormalTok{            achilles\_results.data\_source\_id,}
+\NormalTok{            achilles\_results.analysis\_id,}
+\NormalTok{            achilles\_results.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
+\NormalTok{            achilles\_results.count\_value }\KeywordTok{AS}\NormalTok{ rc}
+          \KeywordTok{FROM}
+\NormalTok{            achilles\_results}
+          \KeywordTok{WHERE}
+\NormalTok{            (}
+\NormalTok{              achilles\_results.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+                \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{401}\NormalTok{):: bigint,}
+\NormalTok{                (}\DecValTok{601}\NormalTok{):: bigint,}
+\NormalTok{                (}\DecValTok{701}\NormalTok{):: bigint,}
+\NormalTok{                (}\DecValTok{801}\NormalTok{):: bigint,}
+\NormalTok{                (}\DecValTok{1801}\NormalTok{):: bigint,}
+\NormalTok{                (}\DecValTok{2101}\NormalTok{):: bigint]}
+\NormalTok{              )}
+\NormalTok{            )}
+\NormalTok{        ) ar1}
+        \KeywordTok{JOIN}\NormalTok{ (}
+          \KeywordTok{SELECT}
+\NormalTok{            ar.data\_source\_id,}
+\NormalTok{            ar.analysis\_id,}
+\NormalTok{            ar.stratum\_1 }\KeywordTok{AS}\NormalTok{ concept\_id,}
+\NormalTok{            ar.count\_value }\KeywordTok{AS}\NormalTok{ drc}
+          \KeywordTok{FROM}
+\NormalTok{            achilles\_results ar}
+          \KeywordTok{WHERE}
+\NormalTok{            (}
+\NormalTok{              ar.analysis\_id }\OperatorTok{=} \KeywordTok{ANY}\NormalTok{ (}
+                \DataTypeTok{ARRAY}\NormalTok{[(}\DecValTok{430}\NormalTok{):: bigint,}
+\NormalTok{                (}\DecValTok{630}\NormalTok{):: bigint,}
+\NormalTok{                (}\DecValTok{730}\NormalTok{):: bigint,}
+\NormalTok{                (}\DecValTok{830}\NormalTok{):: bigint,}
+\NormalTok{                (}\DecValTok{1830}\NormalTok{):: bigint,}
+\NormalTok{                (}\DecValTok{2130}\NormalTok{):: bigint]}
+\NormalTok{              )}
+\NormalTok{            )}
+\NormalTok{        ) ar2 }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{          (}
+\NormalTok{            (ar1.concept\_id }\OperatorTok{=}\NormalTok{ ar2.concept\_id)}
+            \KeywordTok{AND}\NormalTok{ (}
+\NormalTok{              ar1.data\_source\_id }\OperatorTok{=}\NormalTok{ ar2.data\_source\_id}
+\NormalTok{            )}
+\NormalTok{          )}
+\NormalTok{        )}
+\NormalTok{      )}
+      \KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{source} \KeywordTok{ON}\NormalTok{ (}
+\NormalTok{        (ar1.data\_source\_id }\OperatorTok{=} \KeywordTok{source}\NormalTok{.}\KeywordTok{id}\NormalTok{)}
+\NormalTok{      )}
+\NormalTok{    )}
+    \KeywordTok{JOIN}\NormalTok{ concept concept }\KeywordTok{ON}\NormalTok{ (}
+\NormalTok{      (}
+\NormalTok{        ar1.concept\_id }\OperatorTok{=}\NormalTok{ (concept.concept\_id):: text}
+\NormalTok{      )}
+\NormalTok{    )}
+\NormalTok{  )}
+\KeywordTok{ORDER} \KeywordTok{BY}\NormalTok{ ((ar2.drc):: }\DataTypeTok{integer}\NormalTok{) }\KeywordTok{DESC}\NormalTok{;}
 \end{Highlighting}
 \end{Shaded}
 
@@ -3143,7 +3539,8 @@ \subsubsection*{SQL query}\label{sql-query}}
        \KeywordTok{source}\NormalTok{.database\_type,}
        \KeywordTok{source}\NormalTok{.acronym}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.country }\KeywordTok{AS}\NormalTok{ country }\KeywordTok{ON} \KeywordTok{source}\NormalTok{.country\_id}\OperatorTok{=}\NormalTok{country.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.country }\KeywordTok{AS}\NormalTok{ country}
+  \KeywordTok{ON} \KeywordTok{source}\NormalTok{.country\_id}\OperatorTok{=}\NormalTok{country.}\KeywordTok{id}
 \end{Highlighting}
 \end{Shaded}
 
@@ -3300,8 +3697,10 @@ \subsubsection*{SQL query}\label{sql-query-2}}
 \NormalTok{        concepts.concept\_name }\KeywordTok{AS}\NormalTok{ gender,}
 \NormalTok{        achilles.count\_value }\KeywordTok{as} \FunctionTok{count}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.country }\KeywordTok{AS}\NormalTok{ country }\KeywordTok{ON} \KeywordTok{source}\NormalTok{.country\_id}\OperatorTok{=}\NormalTok{country.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.country }\KeywordTok{AS}\NormalTok{ country}
+  \KeywordTok{ON} \KeywordTok{source}\NormalTok{.country\_id}\OperatorTok{=}\NormalTok{country.}\KeywordTok{id}
 \KeywordTok{JOIN}\NormalTok{ (}
   \KeywordTok{SELECT} \StringTok{\textquotesingle{}8507\textquotesingle{}} \KeywordTok{AS}\NormalTok{ concept\_id, }\StringTok{\textquotesingle{}Male\textquotesingle{}} \KeywordTok{AS}\NormalTok{ concept\_name}
   \KeywordTok{UNION}
@@ -3387,18 +3786,20 @@ \subsection*{Patients per Country}\label{patients-per-country}}
 \includegraphics[width=1\linewidth]{images/03-general/04-patients_per_country} \caption{Settings for creating the Patients per Country chart}\label{fig:patientsPerCountry}
 \end{figure}
 
-\hypertarget{sql-query-patientspercountryquery}{%
-\subsubsection*{SQL query \{\#patientsPerCountryQuery\}}\label{sql-query-patientspercountryquery}}
-\addcontentsline{toc}{subsubsection}{SQL query \{\#patientsPerCountryQuery\}}
+\hypertarget{patientsPerCountryQuery}{%
+\subsubsection*{SQL query}\label{patientsPerCountryQuery}}
+\addcontentsline{toc}{subsubsection}{SQL query}
 
 \begin{Shaded}
 \begin{Highlighting}[]
 \KeywordTok{SELECT}\NormalTok{ country.country,}
        \KeywordTok{source}\NormalTok{.database\_type,}
 \NormalTok{       count\_value}
-\KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles }
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.country }\KeywordTok{AS}\NormalTok{ country }\KeywordTok{ON} \KeywordTok{source}\NormalTok{.country\_id}\OperatorTok{=}\NormalTok{country.}\KeywordTok{id}
+\KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.country }\KeywordTok{AS}\NormalTok{ country}
+  \KeywordTok{ON} \KeywordTok{source}\NormalTok{.country\_id}\OperatorTok{=}\NormalTok{country.}\KeywordTok{id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{1}
 \end{Highlighting}
 \end{Shaded}
@@ -3554,7 +3955,8 @@ \subsubsection*{SQL query}\label{sql-query-4}}
 \NormalTok{        longitude,}
 \NormalTok{        country}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.country }\KeywordTok{AS}\NormalTok{ country }\KeywordTok{ON} \KeywordTok{source}\NormalTok{.country\_id}\OperatorTok{=}\NormalTok{country.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.country }\KeywordTok{AS}\NormalTok{ country}
+  \KeywordTok{ON} \KeywordTok{source}\NormalTok{.country\_id}\OperatorTok{=}\NormalTok{country.}\KeywordTok{id}
 \end{Highlighting}
 \end{Shaded}
 
@@ -3630,7 +4032,8 @@ \subsubsection*{SQL query}\label{sql-query-5}}
 \NormalTok{  stratum\_4 }\KeywordTok{as} \OtherTok{"cdm\_version"}\NormalTok{,}
 \NormalTok{  stratum\_5 }\KeywordTok{as} \OtherTok{"vocabulary\_version"}
 \KeywordTok{FROM}\NormalTok{ achilles\_results}
-\KeywordTok{JOIN}\NormalTok{ data\_source }\KeywordTok{ON}\NormalTok{ achilles\_results.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}
+\KeywordTok{JOIN}\NormalTok{ data\_source}
+  \KeywordTok{ON}\NormalTok{ achilles\_results.data\_source\_id }\OperatorTok{=}\NormalTok{ data\_source.}\KeywordTok{id}
 \KeywordTok{JOIN}\NormalTok{ country }\KeywordTok{ON}\NormalTok{ data\_source.country\_id }\OperatorTok{=}\NormalTok{ country.}\KeywordTok{id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id}\OperatorTok{=}\DecValTok{5000}
 \end{Highlighting}
@@ -3792,19 +4195,39 @@ \subsubsection*{SQL query}\label{sql-query-7}}
 \begin{Highlighting}[]
 \KeywordTok{SELECT} \KeywordTok{source}\NormalTok{.name,}
        \KeywordTok{source}\NormalTok{.acronym,}
-       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{10} \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"0{-}10"}\NormalTok{,}
-       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{10} \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{20} \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"10{-}20"}\NormalTok{,}
-       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{20} \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{30} \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"20{-}30"}\NormalTok{,}
-       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{30} \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{40} \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"30{-}40"}\NormalTok{,}
-       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{40} \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{50} \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"40{-}50"}\NormalTok{,}
-       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{50} \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{60} \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"50{-}60"}\NormalTok{,}
-       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{60} \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{70} \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"60{-}70"}\NormalTok{,}
-       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{70} \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{80} \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"70{-}80"}\NormalTok{,}
-       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{80} \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{90} \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"80{-}90"}\NormalTok{,}
-       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{90} \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"90+"}
+       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{10}
+         \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"0{-}10"}\NormalTok{,}
+       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{10}
+         \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{20}
+         \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"10{-}20"}\NormalTok{,}
+       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{20}
+         \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{30}
+         \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"20{-}30"}\NormalTok{,}
+       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{30}
+         \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{40}
+         \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"30{-}40"}\NormalTok{,}
+       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{40}
+         \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{50}
+         \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"40{-}50"}\NormalTok{,}
+       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{50}
+         \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{60}
+         \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"50{-}60"}\NormalTok{,}
+       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{60}
+         \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{70}
+         \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"60{-}70"}\NormalTok{,}
+       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{70}
+         \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{80}
+         \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"70{-}80"}\NormalTok{,}
+       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{80}
+         \KeywordTok{AND} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textless{}} \DecValTok{90}
+         \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"80{-}90"}\NormalTok{,}
+       \FunctionTok{SUM}\NormalTok{(}\ControlFlowTok{CASE} \ControlFlowTok{WHEN} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS} \DataTypeTok{INTEGER}\NormalTok{) }\OperatorTok{\textgreater{}=} \DecValTok{90}
+         \ControlFlowTok{THEN}\NormalTok{ count\_value }\ControlFlowTok{END}\NormalTok{) }\KeywordTok{AS} \OtherTok{"90+"}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.concept }\KeywordTok{ON} \FunctionTok{CAST}\NormalTok{(stratum\_1 }\KeywordTok{AS}\NormalTok{ BIGINT) }\OperatorTok{=}\NormalTok{ concept\_id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.concept}
+  \KeywordTok{ON} \FunctionTok{CAST}\NormalTok{(stratum\_1 }\KeywordTok{AS}\NormalTok{ BIGINT) }\OperatorTok{=}\NormalTok{ concept\_id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{102}
 \KeywordTok{GROUP} \KeywordTok{BY}\NormalTok{ name, acronym}
 \end{Highlighting}
@@ -3883,7 +4306,8 @@ \subsubsection*{SQL query}\label{sql-query-8}}
 \NormalTok{    count\_value }\KeywordTok{AS} \FunctionTok{count}\NormalTok{, }
     \KeywordTok{source}\NormalTok{.acronym}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{101}
 \end{Highlighting}
 \end{Shaded}
@@ -3977,7 +4401,8 @@ \subsubsection*{SQL query}\label{sql-query-9}}
 \NormalTok{       stratum\_1 }\KeywordTok{AS} \OtherTok{"Birth\_year"}\NormalTok{,}
 \NormalTok{       count\_value }\KeywordTok{AS} \FunctionTok{count}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{3}
 \end{Highlighting}
 \end{Shaded}
@@ -4073,7 +4498,8 @@ \subsubsection*{SQL query}\label{sql-query-10}}
 \NormalTok{       count\_value }\KeywordTok{AS}\NormalTok{ Number\_of\_persons,}
        \KeywordTok{source}\NormalTok{.acronym}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
 \KeywordTok{JOIN}\NormalTok{ (}
   \KeywordTok{SELECT} \StringTok{\textquotesingle{}8507\textquotesingle{}} \KeywordTok{AS}\NormalTok{ concept\_id, }\StringTok{\textquotesingle{}Male\textquotesingle{}} \KeywordTok{AS}\NormalTok{ concept\_name}
   \KeywordTok{UNION}
@@ -4237,9 +4663,9 @@ \subsubsection*{Chart settings}\label{chart-settings-12}}
   \end{itemize}
 \end{itemize}
 
-\hypertarget{number-of-patients-in-observation-period-numinobservationperiod}{%
-\subsection*{Number of Patients in Observation Period \{\#numInObservationPeriod\}}\label{number-of-patients-in-observation-period-numinobservationperiod}}
-\addcontentsline{toc}{subsection}{Number of Patients in Observation Period \{\#numInObservationPeriod\}}
+\hypertarget{numInObservationPeriod}{%
+\subsection*{Number of Patients in Observation Period}\label{numInObservationPeriod}}
+\addcontentsline{toc}{subsection}{Number of Patients in Observation Period}
 
 The Number of Patients in Observation Period plot shows the number of patients that contribute at least one day in a specific month.
 
@@ -4258,7 +4684,8 @@ \subsubsection*{SQL query}\label{sql-query-12}}
        \FunctionTok{to\_date}\NormalTok{(stratum\_1, }\StringTok{\textquotesingle{}YYYYMM\textquotesingle{}}\NormalTok{) }\KeywordTok{as} \DataTypeTok{Date}\NormalTok{,}
 \NormalTok{       count\_value}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{110}
 \end{Highlighting}
 \end{Shaded}
@@ -4352,7 +4779,8 @@ \subsubsection*{SQL query}\label{sql-query-13}}
        \FunctionTok{to\_date}\NormalTok{(stratum\_1, }\StringTok{\textquotesingle{}YYYYMM\textquotesingle{}}\NormalTok{) }\KeywordTok{AS}\NormalTok{ year\_month,}
 \NormalTok{       count\_value}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{111}
 \end{Highlighting}
 \end{Shaded}
@@ -4446,7 +4874,8 @@ \subsubsection*{SQL query}\label{sql-query-14}}
        \FunctionTok{to\_date}\NormalTok{(stratum\_1, }\StringTok{\textquotesingle{}YYYYMM\textquotesingle{}}\NormalTok{) }\KeywordTok{AS}\NormalTok{ year\_month,}
 \NormalTok{       count\_value}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{112}
 \end{Highlighting}
 \end{Shaded}
@@ -4607,9 +5036,9 @@ \subsubsection*{Chart settings}\label{chart-settings-16}}
   \end{itemize}
 \end{itemize}
 
-\hypertarget{visit-type-table-visittypetable}{%
-\subsection*{Visit Type Table \{\#visitTypeTable\}}\label{visit-type-table-visittypetable}}
-\addcontentsline{toc}{subsection}{Visit Type Table \{\#visitTypeTable\}}
+\hypertarget{visitTypeTable}{%
+\subsection*{Visit Type Table}\label{visitTypeTable}}
+\addcontentsline{toc}{subsection}{Visit Type Table}
 
 \begin{figure}
 \includegraphics[width=1\linewidth]{images/06-visit/02-visit_types_table} \caption{Settings for creating the Visit Type Table chart}\label{fig:visitTypeTable}
@@ -4626,8 +5055,10 @@ \subsubsection*{SQL query}\label{sql-query-16}}
 \NormalTok{       concept\_name }\KeywordTok{AS} \OtherTok{"Type"}\NormalTok{,}
        \FunctionTok{MAX}\NormalTok{(count\_value) }\KeywordTok{AS} \OtherTok{"Count"}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.concept }\KeywordTok{ON} \FunctionTok{CAST}\NormalTok{(stratum\_1 }\KeywordTok{AS}\NormalTok{ BIGINT) }\OperatorTok{=}\NormalTok{ concept\_id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.concept}
+  \KeywordTok{ON} \FunctionTok{CAST}\NormalTok{(stratum\_1 }\KeywordTok{AS}\NormalTok{ BIGINT) }\OperatorTok{=}\NormalTok{ concept\_id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{201}
 \KeywordTok{GROUP} \KeywordTok{BY}\NormalTok{ name, acronym, }\OtherTok{"Type"}
 \KeywordTok{ORDER} \KeywordTok{BY} \OtherTok{"Count"} \KeywordTok{DESC}
@@ -4693,8 +5124,10 @@ \subsubsection*{SQL query}\label{sql-query-17}}
 \NormalTok{       concept\_name }\KeywordTok{AS} \OtherTok{"Observation"}\NormalTok{, }
 \NormalTok{       count\_value}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles }
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.concept }\KeywordTok{ON} \FunctionTok{CAST}\NormalTok{(stratum\_1 }\KeywordTok{AS}\NormalTok{ BIGINT) }\OperatorTok{=}\NormalTok{ concept\_id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.concept}
+  \KeywordTok{ON} \FunctionTok{CAST}\NormalTok{(stratum\_1 }\KeywordTok{AS}\NormalTok{ BIGINT) }\OperatorTok{=}\NormalTok{ concept\_id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{201}
 \end{Highlighting}
 \end{Shaded}
@@ -4871,7 +5304,8 @@ \subsubsection*{SQL query}\label{sql-query-19}}
 \NormalTok{    count\_value,}
     \KeywordTok{source}\NormalTok{.acronym}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{501}
 \end{Highlighting}
 \end{Shaded}
@@ -4959,7 +5393,8 @@ \subsubsection*{SQL query}\label{sql-query-20}}
     \FunctionTok{EXTRACT}\NormalTok{(}\DataTypeTok{year} \KeywordTok{FROM} \FunctionTok{TO\_DATE}\NormalTok{(stratum\_1, }\StringTok{\textquotesingle{}YYYYMM\textquotesingle{}}\NormalTok{)) }\KeywordTok{AS} \DataTypeTok{Date}\NormalTok{,}
 \NormalTok{    count\_value}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{as}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{as} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{as} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{502}
 \end{Highlighting}
 \end{Shaded}
@@ -5076,10 +5511,15 @@ \subsubsection*{SQL query}\label{sql-query-21}}
 \NormalTok{     domain\_id,}
      \KeywordTok{source}\NormalTok{.name }\KeywordTok{AS}\NormalTok{ source\_name,}
      \KeywordTok{source}\NormalTok{.acronym}
-\KeywordTok{FROM}\NormalTok{ achilles\_results}
-\KeywordTok{JOIN}\NormalTok{ concept }\KeywordTok{ON} \FunctionTok{cast}\NormalTok{(stratum\_1 }\KeywordTok{AS}\NormalTok{ BIGINT) }\OperatorTok{=}\NormalTok{ concept\_id}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
-\KeywordTok{WHERE}\NormalTok{ analysis\_id }\KeywordTok{in}\NormalTok{ (}\DecValTok{201}\NormalTok{, }\DecValTok{401}\NormalTok{, }\DecValTok{601}\NormalTok{, }\DecValTok{701}\NormalTok{, }\DecValTok{801}\NormalTok{, }\DecValTok{901}\NormalTok{, }\DecValTok{1001}\NormalTok{, }\DecValTok{1801}\NormalTok{, }\DecValTok{200}\NormalTok{, }\DecValTok{400}\NormalTok{, }\DecValTok{600}\NormalTok{, }\DecValTok{700}\NormalTok{, }\DecValTok{800}\NormalTok{, }\DecValTok{1800}\NormalTok{)}
+\KeywordTok{FROM}\NormalTok{ achilles\_results }\KeywordTok{JOIN}\NormalTok{ concept}
+  \KeywordTok{ON} \FunctionTok{cast}\NormalTok{(stratum\_1 }\KeywordTok{AS}\NormalTok{ BIGINT) }\OperatorTok{=}\NormalTok{ concept\_id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{WHERE}
+\NormalTok{  analysis\_id }\KeywordTok{in}\NormalTok{ (}
+    \DecValTok{201}\NormalTok{, }\DecValTok{401}\NormalTok{, }\DecValTok{601}\NormalTok{, }\DecValTok{701}\NormalTok{, }\DecValTok{801}\NormalTok{, }\DecValTok{901}\NormalTok{, }\DecValTok{1001}\NormalTok{, }\DecValTok{1801}\NormalTok{,}
+    \DecValTok{200}\NormalTok{, }\DecValTok{400}\NormalTok{, }\DecValTok{600}\NormalTok{, }\DecValTok{700}\NormalTok{, }\DecValTok{800}\NormalTok{, }\DecValTok{1800}
+\NormalTok{  )}
 \end{Highlighting}
 \end{Shaded}
 
@@ -5207,21 +5647,33 @@ \subsection*{Concept Browser Table \{\#conceptBrowserTable\}}\label{concept-brow
     \FunctionTok{sum}\NormalTok{(q1.count\_value) }\KeywordTok{as} \OtherTok{"Occurrence\_count"}\NormalTok{,}
     \FunctionTok{sum}\NormalTok{(q1.count\_person) }\KeywordTok{as} \OtherTok{"Person\_count"}\NormalTok{,}
     \ControlFlowTok{CASE} 
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{10} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}\textless{}=10\textquotesingle{}}
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{100} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}11{-}10ˆ2\textquotesingle{}}
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{1000} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ2{-}10ˆ3\textquotesingle{}}
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{10000} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ3{-}10ˆ4\textquotesingle{}}
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{100000} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ4{-}10ˆ5\textquotesingle{}}
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{1000000} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ5{-}10ˆ6\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{10}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}\textless{}=10\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{100}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}11{-}10ˆ2\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{1000}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ2{-}10ˆ3\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{10000}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ3{-}10ˆ4\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{100000}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ4{-}10ˆ5\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_value)}\OperatorTok{\textless{}=}\DecValTok{1000000}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ5{-}10ˆ6\textquotesingle{}}
         \ControlFlowTok{ELSE} \StringTok{\textquotesingle{}\textgreater{}10ˆ6\textquotesingle{}}
     \ControlFlowTok{END} \KeywordTok{as} \OtherTok{"magnitude\_occurrences"}\NormalTok{,}
     \ControlFlowTok{CASE} 
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{10} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}\textless{}=10\textquotesingle{}}
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{100} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}11{-}10ˆ2\textquotesingle{}}
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{1000} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ2{-}10ˆ3\textquotesingle{}}
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{10000} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ3{-}10ˆ4\textquotesingle{}}
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{100000} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ4{-}10ˆ5\textquotesingle{}}
-        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{1000000} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ5{-}10ˆ6\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{10}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}\textless{}=10\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{100}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}11{-}10ˆ2\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{1000}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ2{-}10ˆ3\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{10000}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ3{-}10ˆ4\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{100000}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ4{-}10ˆ5\textquotesingle{}}
+        \ControlFlowTok{WHEN} \FunctionTok{sum}\NormalTok{(q1.count\_person)}\OperatorTok{\textless{}=}\DecValTok{1000000}
+          \ControlFlowTok{THEN} \StringTok{\textquotesingle{}10ˆ5{-}10ˆ6\textquotesingle{}}
         \ControlFlowTok{ELSE} \StringTok{\textquotesingle{}\textgreater{}10ˆ6\textquotesingle{}}
     \ControlFlowTok{END} \KeywordTok{AS} \OtherTok{"magnitude\_persons"}
 \KeywordTok{FROM}\NormalTok{ (}\KeywordTok{SELECT}\NormalTok{ analysis\_id,}
@@ -5231,8 +5683,13 @@ \subsection*{Concept Browser Table \{\#conceptBrowserTable\}}\label{concept-brow
 \NormalTok{             domain\_id,}
 \NormalTok{             count\_value, }\DecValTok{0} \KeywordTok{as}\NormalTok{ count\_person}
     \KeywordTok{FROM}\NormalTok{ achilles\_results}
-    \KeywordTok{JOIN}\NormalTok{ concept }\KeywordTok{ON} \FunctionTok{cast}\NormalTok{(stratum\_1 }\KeywordTok{AS}\NormalTok{ BIGINT)}\OperatorTok{=}\NormalTok{concept\_id}
-    \KeywordTok{WHERE}\NormalTok{ analysis\_id }\KeywordTok{in}\NormalTok{ (}\DecValTok{201}\NormalTok{, }\DecValTok{301}\NormalTok{, }\DecValTok{401}\NormalTok{, }\DecValTok{601}\NormalTok{, }\DecValTok{701}\NormalTok{, }\DecValTok{801}\NormalTok{, }\DecValTok{901}\NormalTok{, }\DecValTok{1001}\NormalTok{, }\DecValTok{1801}\NormalTok{)}
+    \KeywordTok{JOIN}\NormalTok{ concept}
+      \KeywordTok{ON} \FunctionTok{cast}\NormalTok{(stratum\_1 }\KeywordTok{AS}\NormalTok{ BIGINT)}\OperatorTok{=}\NormalTok{concept\_id}
+    \KeywordTok{WHERE}
+\NormalTok{      analysis\_id }\KeywordTok{in}\NormalTok{ (}
+        \DecValTok{201}\NormalTok{, }\DecValTok{301}\NormalTok{, }\DecValTok{401}\NormalTok{, }\DecValTok{601}\NormalTok{, }\DecValTok{701}\NormalTok{, }\DecValTok{801}\NormalTok{, }\DecValTok{901}\NormalTok{, }\DecValTok{1001}\NormalTok{,}
+        \DecValTok{1801}
+\NormalTok{      )}
     \KeywordTok{UNION}\NormalTok{ (}\KeywordTok{SELECT}\NormalTok{  analysis\_id,}
 \NormalTok{                   stratum\_1 concept\_id,}
 \NormalTok{                   data\_source\_id,}
@@ -5241,11 +5698,27 @@ \subsection*{Concept Browser Table \{\#conceptBrowserTable\}}\label{concept-brow
                    \DecValTok{0} \KeywordTok{as}\NormalTok{ count\_value,}
                    \FunctionTok{sum}\NormalTok{(count\_value) }\KeywordTok{as}\NormalTok{ count\_person}
             \KeywordTok{FROM}\NormalTok{  achilles\_results}
-            \KeywordTok{JOIN}\NormalTok{ concept }\KeywordTok{on} \FunctionTok{cast}\NormalTok{(stratum\_1 }\KeywordTok{as}\NormalTok{ BIGINT)}\OperatorTok{=}\NormalTok{concept\_id}
-            \KeywordTok{WHERE}\NormalTok{ analysis\_id }\KeywordTok{in}\NormalTok{ (}\DecValTok{202}\NormalTok{, }\DecValTok{401}\NormalTok{, }\DecValTok{601}\NormalTok{, }\DecValTok{701}\NormalTok{, }\DecValTok{801}\NormalTok{, }\DecValTok{901}\NormalTok{, }\DecValTok{1001}\NormalTok{, }\DecValTok{1801}\NormalTok{)}
-            \KeywordTok{GROUP} \KeywordTok{BY}\NormalTok{ analysis\_id,stratum\_1,data\_source\_id,concept\_name,domain\_id) ) }\KeywordTok{as}\NormalTok{ q1}
-    \KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ q1.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
-\KeywordTok{GROUP} \KeywordTok{BY}\NormalTok{ q1.concept\_id,q1.concept\_name,q1.domain\_id,}\KeywordTok{source}\NormalTok{.name, acronym}
+            \KeywordTok{JOIN}\NormalTok{ concept}
+              \KeywordTok{ON} \FunctionTok{cast}\NormalTok{(stratum\_1 }\KeywordTok{as}\NormalTok{ BIGINT)}\OperatorTok{=}\NormalTok{concept\_id}
+            \KeywordTok{WHERE}
+\NormalTok{              analysis\_id }\KeywordTok{in}\NormalTok{ (}
+                \DecValTok{202}\NormalTok{, }\DecValTok{401}\NormalTok{, }\DecValTok{601}\NormalTok{, }\DecValTok{701}\NormalTok{, }\DecValTok{801}\NormalTok{, }\DecValTok{901}\NormalTok{, }\DecValTok{1001}\NormalTok{, }\DecValTok{1801}
+\NormalTok{              )}
+            \KeywordTok{GROUP} \KeywordTok{BY}
+\NormalTok{              analysis\_id,}
+\NormalTok{              stratum\_1,}
+\NormalTok{              data\_source\_id,}
+\NormalTok{              concept\_name,}
+\NormalTok{              domain\_id}
+\NormalTok{            )) }\KeywordTok{as}\NormalTok{ q1}
+    \KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+      \KeywordTok{ON}\NormalTok{ q1.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{GROUP} \KeywordTok{BY}
+\NormalTok{  q1.concept\_id,}
+\NormalTok{  q1.concept\_name,}
+\NormalTok{  q1.domain\_id,}
+  \KeywordTok{source}\NormalTok{.name,}
+\NormalTok{  acronym}
 \KeywordTok{ORDER} \KeywordTok{BY} \OtherTok{"Person\_count"} \KeywordTok{desc}
 \end{Highlighting}
 \end{Shaded}
@@ -5414,18 +5887,26 @@ \subsubsection*{SQL query}\label{sql-query-24}}
 \begin{Highlighting}[]
 \KeywordTok{SELECT} \KeywordTok{source}\NormalTok{.name,}
     \KeywordTok{source}\NormalTok{.acronym,}
-    \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{405} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{605} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{705} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{805} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{1805} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{2105} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}
+    \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{405}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{605}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{705}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{805}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{1805}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{2105}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}
     \ControlFlowTok{ELSE} \StringTok{\textquotesingle{}Other\textquotesingle{}} \ControlFlowTok{END} \KeywordTok{AS}\NormalTok{ domain\_name,}
 \NormalTok{    concept\_name,}
     \FunctionTok{SUM}\NormalTok{(count\_value) }\KeywordTok{AS}\NormalTok{ num\_records}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.concept }\KeywordTok{AS}\NormalTok{ c1 }\KeywordTok{ON} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS}\NormalTok{ BIGINT) }\OperatorTok{=}\NormalTok{ concept\_id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.concept }\KeywordTok{AS}\NormalTok{ c1}
+  \KeywordTok{ON} \FunctionTok{CAST}\NormalTok{(stratum\_2 }\KeywordTok{AS}\NormalTok{ BIGINT) }\OperatorTok{=}\NormalTok{ concept\_id}
 \KeywordTok{WHERE}\NormalTok{ analysis\_id }\KeywordTok{IN}\NormalTok{ (}\DecValTok{405}\NormalTok{,}\DecValTok{605}\NormalTok{,}\DecValTok{705}\NormalTok{,}\DecValTok{805}\NormalTok{,}\DecValTok{1805}\NormalTok{,}\DecValTok{2105}\NormalTok{)}
 \KeywordTok{GROUP} \KeywordTok{BY} \KeywordTok{source}\NormalTok{.name, }\KeywordTok{source}\NormalTok{.acronym, concept\_name, }
     \ControlFlowTok{CASE} \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{405} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}
@@ -5582,9 +6063,9 @@ \subsubsection*{Chart settings}\label{chart-settings-27}}
   \end{itemize}
 \end{itemize}
 
-\hypertarget{average-number-of-records-per-person-avgrecordsperperson}{%
-\subsection*{Average Number of Records per Person \{\#avgRecordsPerPerson\}}\label{average-number-of-records-per-person-avgrecordsperperson}}
-\addcontentsline{toc}{subsection}{Average Number of Records per Person \{\#avgRecordsPerPerson\}}
+\hypertarget{avgRecordsPerPerson}{%
+\subsection*{Average Number of Records per Person}\label{avgRecordsPerPerson}}
+\addcontentsline{toc}{subsection}{Average Number of Records per Person}
 
 \begin{figure}
 \includegraphics[width=1\linewidth]{images/10-data_domain/02-avg_records_per_person} \caption{Settings for creating the Data Source filter chart}\label{fig:unnamed-chunk-1}
@@ -5600,25 +6081,41 @@ \subsubsection*{SQL query}\label{sql-query-26}}
     \KeywordTok{source}\NormalTok{.name,}
     \KeywordTok{source}\NormalTok{.acronym,}
     \ControlFlowTok{CASE} 
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{201} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Visit\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{401} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{501} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Death\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{601} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{701} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug Exposure\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{801} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{1801} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{2101} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}
-    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{2201} \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Note\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{201}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Visit\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{401}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Condition\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{501}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Death\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{601}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Procedure\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{701}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Drug Exposure\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{801}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Observation\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{1801}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Measurement\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{2101}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Device\textquotesingle{}}
+    \ControlFlowTok{WHEN}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{2201}
+      \ControlFlowTok{THEN} \StringTok{\textquotesingle{}Note\textquotesingle{}}
     \ControlFlowTok{END} \KeywordTok{AS}\NormalTok{ Data\_Domain,}
-    \FunctionTok{SUM}\NormalTok{(count\_value) }\OperatorTok{/}\FunctionTok{AVG}\NormalTok{(num\_persons) }\KeywordTok{AS} \OtherTok{"records\_per\_person"}
+    \FunctionTok{SUM}\NormalTok{(count\_value) }\OperatorTok{/}\FunctionTok{AVG}\NormalTok{(num\_persons)}
+      \KeywordTok{AS} \OtherTok{"records\_per\_person"}
 \KeywordTok{FROM} \KeywordTok{public}\NormalTok{.achilles\_results }\KeywordTok{AS}\NormalTok{ achilles}
-\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source} \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
+\KeywordTok{INNER} \KeywordTok{JOIN} \KeywordTok{public}\NormalTok{.data\_source }\KeywordTok{AS} \KeywordTok{source}
+  \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id}\OperatorTok{=}\KeywordTok{source}\NormalTok{.}\KeywordTok{id}
 \KeywordTok{INNER} \KeywordTok{JOIN}\NormalTok{ (}
   \KeywordTok{SELECT}\NormalTok{ data\_source\_id , count\_value }\KeywordTok{as}\NormalTok{ num\_persons}
   \KeywordTok{FROM}\NormalTok{ achilles\_results}
-  \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{1}\NormalTok{) counts }\KeywordTok{ON}\NormalTok{ achilles.data\_source\_id }\OperatorTok{=}\NormalTok{ counts.data\_source\_id }
+  \KeywordTok{WHERE}\NormalTok{ analysis\_id }\OperatorTok{=} \DecValTok{1}\NormalTok{) counts}
+    \KeywordTok{ON}\NormalTok{ achilles.data\_source\_id }\OperatorTok{=}\NormalTok{ counts.data\_source\_id}
 \KeywordTok{GROUP} \KeywordTok{BY}\NormalTok{ analysis\_id, }\KeywordTok{source}\NormalTok{.name, }\KeywordTok{source}\NormalTok{.acronym}
-\KeywordTok{HAVING}\NormalTok{ analysis\_id }\KeywordTok{IN}\NormalTok{ (}\DecValTok{201}\NormalTok{, }\DecValTok{401}\NormalTok{, }\DecValTok{501}\NormalTok{, }\DecValTok{601}\NormalTok{, }\DecValTok{701}\NormalTok{, }\DecValTok{801}\NormalTok{, }\DecValTok{1801}\NormalTok{, }\DecValTok{2101}\NormalTok{, }\DecValTok{2201}\NormalTok{)}
+\KeywordTok{HAVING}
+\NormalTok{  analysis\_id }\KeywordTok{IN}\NormalTok{ (}
+    \DecValTok{201}\NormalTok{, }\DecValTok{401}\NormalTok{, }\DecValTok{501}\NormalTok{, }\DecValTok{601}\NormalTok{, }\DecValTok{701}\NormalTok{, }\DecValTok{801}\NormalTok{, }\DecValTok{1801}\NormalTok{, }\DecValTok{2101}\NormalTok{,}
+    \DecValTok{2201}
+\NormalTok{  )}
 \end{Highlighting}
 \end{Shaded}
 
diff --git a/docs/PerDatabaseDashboard.html b/docs/PerDatabaseDashboard.html
index 997bfb04..4659b0d4 100644
--- a/docs/PerDatabaseDashboard.html
+++ b/docs/PerDatabaseDashboard.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -330,17 +330,17 @@ <h2><span class="header-section-number">9.1</span> Network Dashboard</h2>
 <h3>Label Colors</h3>
 <p>In order to obtain the colors blue and rose in the chart representing the gender distribution,
 add the following JSON entry to the JSON object of the <code>JSON Metadata</code> field on the edit dashboard page:</p>
-<div class="sourceCode" id="cb13"><pre class="sourceCode json"><code class="sourceCode json"><span id="cb13-1"><a href="PerDatabaseDashboard.html#cb13-1" aria-hidden="true"></a><span class="er">&quot;label_colors&quot;:</span> <span class="fu">{</span></span>
-<span id="cb13-2"><a href="PerDatabaseDashboard.html#cb13-2" aria-hidden="true"></a>    <span class="dt">&quot;Male&quot;</span><span class="fu">:</span> <span class="st">&quot;#3366FF&quot;</span><span class="fu">,</span> </span>
-<span id="cb13-3"><a href="PerDatabaseDashboard.html#cb13-3" aria-hidden="true"></a>    <span class="dt">&quot;Female&quot;</span><span class="fu">:</span> <span class="st">&quot;#FF3399&quot;</span></span>
-<span id="cb13-4"><a href="PerDatabaseDashboard.html#cb13-4" aria-hidden="true"></a><span class="fu">}</span></span></code></pre></div>
+<div class="sourceCode" id="cb12"><pre class="sourceCode json"><code class="sourceCode json"><span id="cb12-1"><a href="PerDatabaseDashboard.html#cb12-1" aria-hidden="true"></a><span class="er">&quot;label_colors&quot;:</span> <span class="fu">{</span></span>
+<span id="cb12-2"><a href="PerDatabaseDashboard.html#cb12-2" aria-hidden="true"></a>    <span class="dt">&quot;Male&quot;</span><span class="fu">:</span> <span class="st">&quot;#3366FF&quot;</span><span class="fu">,</span> </span>
+<span id="cb12-3"><a href="PerDatabaseDashboard.html#cb12-3" aria-hidden="true"></a>    <span class="dt">&quot;Female&quot;</span><span class="fu">:</span> <span class="st">&quot;#FF3399&quot;</span></span>
+<span id="cb12-4"><a href="PerDatabaseDashboard.html#cb12-4" aria-hidden="true"></a><span class="fu">}</span></span></code></pre></div>
 </div>
 <div id="css" class="section level3 unnumbered" number="">
 <h3>CSS</h3>
 <p>To hide the dashboard header insert the following css code to the <code>CSS</code> field on the edit page:</p>
-<div class="sourceCode" id="cb14"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb14-1"><a href="PerDatabaseDashboard.html#cb14-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
-<span id="cb14-2"><a href="PerDatabaseDashboard.html#cb14-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb14-3"><a href="PerDatabaseDashboard.html#cb14-3" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb13"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb13-1"><a href="PerDatabaseDashboard.html#cb13-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
+<span id="cb13-2"><a href="PerDatabaseDashboard.html#cb13-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb13-3"><a href="PerDatabaseDashboard.html#cb13-3" aria-hidden="true"></a>}</span></code></pre></div>
 <p>With this every time you want to edit the dashboard layout you have to either comment the CSS inserted
 or remove it so the “Edit Dashboard” button can show again.</p>
 </div>
diff --git a/docs/backups.html b/docs/backups.html
index ee4a8004..9e252b94 100644
--- a/docs/backups.html
+++ b/docs/backups.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -32,7 +32,7 @@
   
   
 <link rel="prev" href="processes.html"/>
-<link rel="next" href="restore.html"/>
+<link rel="next" href="customizations.html"/>
 <script src="libs/header-attrs-2.11/header-attrs.js"></script>
 <script src="libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/fuse.js@6.4.6/dist/fuse.min.js"></script>
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -327,7 +327,7 @@ <h1>
 <h1><span class="header-section-number">Chapter 5</span> Backups</h1>
 <ol style="list-style-type: decimal">
 <li><p>Create a credentials file (the structure of the file depends on the target cloud server)</p></li>
-<li><p>Create a <code>.dashboards_backups.conf</code> file under your home directory (variable <code>$HOME</code>) using <code>dashboards_backups.conf.example</code> as base, setting the appropriate value for the several variables.</p>
+<li><p>Create a <code>backups.conf</code> under the <code>backups</code> directory using <code>backups.conf.example</code> as base, setting the appropriate value for the several variables.</p>
 <p>For variables associated with files and directories always use <em>absolute</em> paths.</p>
 <p>Variables:</p>
 <ul>
@@ -362,6 +362,40 @@ <h1><span class="header-section-number">Chapter 5</span> Backups</h1>
 <li><p>Add entry <code>0 3 * * * $HOME/NetworkDashboards/backups/backup.sh</code> (The path to the backup script might be different)</p></li>
 </ol></li>
 </ol>
+<div id="restore" class="section level3 unnumbered" number="">
+<h3>Restore</h3>
+<ol style="list-style-type: decimal">
+<li><p>Select the compressed backup you want to restore.</p></li>
+<li><p>Make sure that all the environment variables are the same as the ones that were used for the chosen backup file.
+Additionally, the <code>backups.conf</code> file is also necessary to set up, since the <code>TMP_DIRECTORY</code> variable will be used.</p></li>
+<li><p>Run the <code>backups/restore.sh</code> script.</p></li>
+</ol>
+</div>
+<div id="useful-stuff" class="section level3 unnumbered" number="">
+<h3>Useful stuff</h3>
+<ul>
+<li><p>How to create a shared link to a dropbox directory using its python’s API:</p>
+<div class="sourceCode" id="cb9"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb9-1"><a href="backups.html#cb9-1" aria-hidden="true"></a><span class="ex">pip</span> install dropbox</span></code></pre></div>
+<div class="sourceCode" id="cb10"><pre class="sourceCode python"><code class="sourceCode python"><span id="cb10-1"><a href="backups.html#cb10-1" aria-hidden="true"></a><span class="im">import</span> dropbox</span>
+<span id="cb10-2"><a href="backups.html#cb10-2" aria-hidden="true"></a>d <span class="op">=</span> dropbox.Dropbox(API_TOKEN)</span>
+<span id="cb10-3"><a href="backups.html#cb10-3" aria-hidden="true"></a></span>
+<span id="cb10-4"><a href="backups.html#cb10-4" aria-hidden="true"></a><span class="co"># create a shared link for a directory</span></span>
+<span id="cb10-5"><a href="backups.html#cb10-5" aria-hidden="true"></a><span class="im">from</span> dropbox.sharing <span class="im">import</span> SharedLinkSettings</span>
+<span id="cb10-6"><a href="backups.html#cb10-6" aria-hidden="true"></a>sharing_settings <span class="op">=</span> SharedLinkSettings(</span>
+<span id="cb10-7"><a href="backups.html#cb10-7" aria-hidden="true"></a>    require_password<span class="op">=</span><span class="va">True</span>,</span>
+<span id="cb10-8"><a href="backups.html#cb10-8" aria-hidden="true"></a>    link_password<span class="op">=</span>DIRECTORY_PASSWORD,</span>
+<span id="cb10-9"><a href="backups.html#cb10-9" aria-hidden="true"></a>)</span>
+<span id="cb10-10"><a href="backups.html#cb10-10" aria-hidden="true"></a>d.sharing_create_shared_link_with_settings(</span>
+<span id="cb10-11"><a href="backups.html#cb10-11" aria-hidden="true"></a>    DIRECTORY_PATH,</span>
+<span id="cb10-12"><a href="backups.html#cb10-12" aria-hidden="true"></a>    sharing_settings,</span>
+<span id="cb10-13"><a href="backups.html#cb10-13" aria-hidden="true"></a>)</span>
+<span id="cb10-14"><a href="backups.html#cb10-14" aria-hidden="true"></a></span>
+<span id="cb10-15"><a href="backups.html#cb10-15" aria-hidden="true"></a><span class="co"># get all links</span></span>
+<span id="cb10-16"><a href="backups.html#cb10-16" aria-hidden="true"></a><span class="cf">for</span> link <span class="kw">in</span> d.sharing_get_shared_links().links:</span>
+<span id="cb10-17"><a href="backups.html#cb10-17" aria-hidden="true"></a>    <span class="bu">print</span>(<span class="ss">f&quot;</span><span class="sc">{</span>link<span class="sc">.</span>path<span class="sc">}</span><span class="ss"> -&gt; </span><span class="sc">{</span>link<span class="sc">.</span>url<span class="sc">}</span><span class="ss">&quot;</span>)</span></code></pre></div></li>
+</ul>
+
+</div>
 </div>
             </section>
 
@@ -369,7 +403,7 @@ <h1><span class="header-section-number">Chapter 5</span> Backups</h1>
         </div>
       </div>
 <a href="processes.html" class="navigation navigation-prev " aria-label="Previous page"><i class="fa fa-angle-left"></i></a>
-<a href="restore.html" class="navigation navigation-next " aria-label="Next page"><i class="fa fa-angle-right"></i></a>
+<a href="customizations.html" class="navigation navigation-next " aria-label="Next page"><i class="fa fa-angle-right"></i></a>
     </div>
   </div>
 <script src="libs/gitbook-2.6.7/js/app.min.js"></script>
diff --git a/docs/backups.md b/docs/backups.md
index 82c6c507..94914c9f 100644
--- a/docs/backups.md
+++ b/docs/backups.md
@@ -2,7 +2,7 @@
 
 1. Create a credentials file (the structure of the file depends on the target cloud server)
 
-2. Create a `.dashboards_backups.conf` file under your home directory (variable `$HOME`) using `dashboards_backups.conf.example` as base, setting the appropriate value for the several variables.
+2. Create a `backups.conf` under the `backups` directory using `backups.conf.example` as base, setting the appropriate value for the several variables.
    
    For variables associated with files and directories always use *absolute* paths.
    
@@ -50,56 +50,16 @@
    
    2. Add entry `0 3 * * * $HOME/NetworkDashboards/backups/backup.sh` (The path to the backup script might be different)
 
-## Restore
+### Restore {-}
 
-1. Select the compressed backup you want to restore and decompress it:
-   
-   `tar -xJf BACKUP_FILE.tar.xz`.
+1. Select the compressed backup you want to restore.
 
-2. 1. **Redis**
-      
-      1. Make sure the redis docker container is down.
-      
-      2. (Re)place the file `dump.rdb` on the redis volume by the file `redis.rdb`. By default the redis volume is located where this repository was cloned on the directory `docker/volumes/redis`.
-      
-      3. Change its permissions, owner and group:
-         
-         ```shell
-         chmod 0644 docker/volumes/redis/dump.rdb
-         sudo chown -R 999:999 docker/volumes/redis
-         ```
-   
-   2. **Postgres**
-      
-      1. Make sure all containers that make changes on the database are stopped.
-      
-      2. Copy the file `postgres_backup.sql` into the postgres container
-         
-         `docker cp postgres.sql [CONTAINER_ID]:/tmp`.
-      
-      5. Execute the backup script:
-         
-         `docker exec -u root dashboard_viewer_postgres_1 psql -f /tmp/postgres_backup.sql -U \$POSTGRES_USER -d \$POSTGRES_DB`.
-   
-   3. **Media Files** If you have a volume pointing to where the media files are stored, replace all files with the ones present on the downloaded backup file. Else:
-   
-      1. Bring the dashoard container up `docker-compose up -d dashboard`
-      
-      2. Enter in the container `docker exec -it [CONTAINER_ID] bash`
-      
-      3. If you don't know where the media files are stored you can check the value of the MEDIA_ROOT variable
-         
-         1. `python manage.py shell`
-         
-         2. `from django.conf import settings`
-         
-         3. `print(settings.MEDIA_ROOT)`
-      
-      4. Remove the entire MEDIA_ROOT directory and exit the container
-      
-      5. Copy the media directory present on the backup file to the catalogue container `docker cp -a collected-media [CONTAINER_ID]:[MEDIA_ROOT_PARENT_PATH]`
+2. Make sure that all the environment variables are the same as the ones that were used for the chosen backup file.
+   Additionally, the `backups.conf` file is also necessary to set up, since the `TMP_DIRECTORY` variable will be used.
+
+3. Run the `backups/restore.sh` script.
 
-## Useful stuff
+### Useful stuff {-}
 
 - How to create a shared link to a dropbox directory using its python's API:
 
@@ -113,8 +73,14 @@
 
    # create a shared link for a directory
    from dropbox.sharing import SharedLinkSettings
-   sharing_settings = SharedLinkSettings(require_password=True, link_password=DIRECTORY_PASSWORD)
-   d.sharing_create_shared_link_with_settings(DIRECTORY_PATH, sharing_settings)
+   sharing_settings = SharedLinkSettings(
+       require_password=True,
+       link_password=DIRECTORY_PASSWORD,
+   )
+   d.sharing_create_shared_link_with_settings(
+       DIRECTORY_PATH,
+       sharing_settings,
+   )
 
    # get all links
    for link in d.sharing_get_shared_links().links:
diff --git a/docs/code-documentation.html b/docs/code-documentation.html
index 2144ec5b..92095ee4 100644
--- a/docs/code-documentation.html
+++ b/docs/code-documentation.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -368,7 +368,7 @@ <h4>
 </h4>
 <p>Currently, this app is not being used and the URL mapping was delete.
 To use it again uncomment the tabsManager <a href="https://github.com/EHDEN/NetworkDashboards/blob/master/dashboard_viewer/dashboard_viewer/urls.py#L29">line</a> on the dashboard_viewer/dashboard_viewer/urls.py file.
-Then you can access the tabs page through the <code>[BASE_RUL]/tabs/</code> URL.</p>
+Then you can access the tabs page through the <code>[BASE_URL]/tabs/</code> URL.</p>
 <h5>
 Views
 </h5>
diff --git a/docs/code-documentation.md b/docs/code-documentation.md
index 896a05c4..19fb782f 100644
--- a/docs/code-documentation.md
+++ b/docs/code-documentation.md
@@ -42,7 +42,7 @@ Once again to avoid timeouts, such operations are executed on a background task.
 
 Currently, this app is not being used and the URL mapping was delete.
 To use it again uncomment the tabsManager [line](https://github.com/EHDEN/NetworkDashboards/blob/master/dashboard_viewer/dashboard_viewer/urls.py#L29) on the dashboard_viewer/dashboard_viewer/urls.py file.
-Then you can access the tabs page through the `[BASE_RUL]/tabs/` URL.
+Then you can access the tabs page through the `[BASE_URL]/tabs/` URL.
 
 <h5>Views</h5>
 
diff --git a/docs/concepts-browser-deprecated.html b/docs/concepts-browser-deprecated.html
index a791a43f..448ea0f7 100644
--- a/docs/concepts-browser-deprecated.html
+++ b/docs/concepts-browser-deprecated.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -329,9 +329,9 @@ <h2><span class="header-section-number">9.9</span> Concepts Browser [Deprecated]
 <div id="css-7" class="section level3 unnumbered" number="">
 <h3>CSS</h3>
 <p>To hide the dashboard header insert the following css code to the <code>CSS</code> field on the edit page:</p>
-<div class="sourceCode" id="cb65"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb65-1"><a href="concepts-browser-deprecated.html#cb65-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
-<span id="cb65-2"><a href="concepts-browser-deprecated.html#cb65-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb65-3"><a href="concepts-browser-deprecated.html#cb65-3" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb64"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb64-1"><a href="concepts-browser-deprecated.html#cb64-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
+<span id="cb64-2"><a href="concepts-browser-deprecated.html#cb64-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb64-3"><a href="concepts-browser-deprecated.html#cb64-3" aria-hidden="true"></a>}</span></code></pre></div>
 <p>With this every time you want to edit the dashboard layout you have to either comment the CSS inserted
 or remove it so the “Edit Dashboard” button can show again.</p>
 </div>
@@ -346,14 +346,19 @@ <h3>Data Source and Domain Filters</h3>
 <p><strong>For the filters to work the name of the fields to filter should match in all tables used on the charts of this dashboard.</strong></p>
 <div id="sql-query-21" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb66"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb66-1"><a href="concepts-browser-deprecated.html#cb66-1" aria-hidden="true"></a><span class="kw">SELECT</span> concept_name,</span>
-<span id="cb66-2"><a href="concepts-browser-deprecated.html#cb66-2" aria-hidden="true"></a>     domain_id,</span>
-<span id="cb66-3"><a href="concepts-browser-deprecated.html#cb66-3" aria-hidden="true"></a>     <span class="kw">source</span>.name <span class="kw">AS</span> source_name,</span>
-<span id="cb66-4"><a href="concepts-browser-deprecated.html#cb66-4" aria-hidden="true"></a>     <span class="kw">source</span>.acronym</span>
-<span id="cb66-5"><a href="concepts-browser-deprecated.html#cb66-5" aria-hidden="true"></a><span class="kw">FROM</span> achilles_results</span>
-<span id="cb66-6"><a href="concepts-browser-deprecated.html#cb66-6" aria-hidden="true"></a><span class="kw">JOIN</span> concept <span class="kw">ON</span> <span class="fu">cast</span>(stratum_1 <span class="kw">AS</span> BIGINT) <span class="op">=</span> concept_id</span>
-<span id="cb66-7"><a href="concepts-browser-deprecated.html#cb66-7" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb66-8"><a href="concepts-browser-deprecated.html#cb66-8" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="kw">in</span> (<span class="dv">201</span>, <span class="dv">401</span>, <span class="dv">601</span>, <span class="dv">701</span>, <span class="dv">801</span>, <span class="dv">901</span>, <span class="dv">1001</span>, <span class="dv">1801</span>, <span class="dv">200</span>, <span class="dv">400</span>, <span class="dv">600</span>, <span class="dv">700</span>, <span class="dv">800</span>, <span class="dv">1800</span>)</span></code></pre></div>
+<div class="sourceCode" id="cb65"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb65-1"><a href="concepts-browser-deprecated.html#cb65-1" aria-hidden="true"></a><span class="kw">SELECT</span> concept_name,</span>
+<span id="cb65-2"><a href="concepts-browser-deprecated.html#cb65-2" aria-hidden="true"></a>     domain_id,</span>
+<span id="cb65-3"><a href="concepts-browser-deprecated.html#cb65-3" aria-hidden="true"></a>     <span class="kw">source</span>.name <span class="kw">AS</span> source_name,</span>
+<span id="cb65-4"><a href="concepts-browser-deprecated.html#cb65-4" aria-hidden="true"></a>     <span class="kw">source</span>.acronym</span>
+<span id="cb65-5"><a href="concepts-browser-deprecated.html#cb65-5" aria-hidden="true"></a><span class="kw">FROM</span> achilles_results <span class="kw">JOIN</span> concept</span>
+<span id="cb65-6"><a href="concepts-browser-deprecated.html#cb65-6" aria-hidden="true"></a>  <span class="kw">ON</span> <span class="fu">cast</span>(stratum_1 <span class="kw">AS</span> BIGINT) <span class="op">=</span> concept_id</span>
+<span id="cb65-7"><a href="concepts-browser-deprecated.html#cb65-7" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb65-8"><a href="concepts-browser-deprecated.html#cb65-8" aria-hidden="true"></a>  <span class="kw">ON</span> data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb65-9"><a href="concepts-browser-deprecated.html#cb65-9" aria-hidden="true"></a><span class="kw">WHERE</span></span>
+<span id="cb65-10"><a href="concepts-browser-deprecated.html#cb65-10" aria-hidden="true"></a>  analysis_id <span class="kw">in</span> (</span>
+<span id="cb65-11"><a href="concepts-browser-deprecated.html#cb65-11" aria-hidden="true"></a>    <span class="dv">201</span>, <span class="dv">401</span>, <span class="dv">601</span>, <span class="dv">701</span>, <span class="dv">801</span>, <span class="dv">901</span>, <span class="dv">1001</span>, <span class="dv">1801</span>,</span>
+<span id="cb65-12"><a href="concepts-browser-deprecated.html#cb65-12" aria-hidden="true"></a>    <span class="dv">200</span>, <span class="dv">400</span>, <span class="dv">600</span>, <span class="dv">700</span>, <span class="dv">800</span>, <span class="dv">1800</span></span>
+<span id="cb65-13"><a href="concepts-browser-deprecated.html#cb65-13" aria-hidden="true"></a>  )</span></code></pre></div>
 </div>
 <div id="chart-settings-22" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -425,55 +430,88 @@ <h3>Concept Browser Table {#conceptBrowserTable}</h3>
 Figure 9.21: Settings for creating the Concepts Table chart
 </p>
 </div>
-<div class="sourceCode" id="cb67"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb67-1"><a href="concepts-browser-deprecated.html#cb67-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
-<span id="cb67-2"><a href="concepts-browser-deprecated.html#cb67-2" aria-hidden="true"></a>    q1.concept_id <span class="kw">AS</span> concept_id,</span>
-<span id="cb67-3"><a href="concepts-browser-deprecated.html#cb67-3" aria-hidden="true"></a>    q1.concept_name <span class="kw">AS</span> concept_name,</span>
-<span id="cb67-4"><a href="concepts-browser-deprecated.html#cb67-4" aria-hidden="true"></a>    q1.domain_id,</span>
-<span id="cb67-5"><a href="concepts-browser-deprecated.html#cb67-5" aria-hidden="true"></a>    <span class="kw">source</span>.name <span class="kw">AS</span> source_name,</span>
-<span id="cb67-6"><a href="concepts-browser-deprecated.html#cb67-6" aria-hidden="true"></a>    <span class="kw">source</span>.acronym,</span>
-<span id="cb67-7"><a href="concepts-browser-deprecated.html#cb67-7" aria-hidden="true"></a>    <span class="fu">sum</span>(q1.count_value) <span class="kw">as</span> <span class="ot">&quot;Occurrence_count&quot;</span>,</span>
-<span id="cb67-8"><a href="concepts-browser-deprecated.html#cb67-8" aria-hidden="true"></a>    <span class="fu">sum</span>(q1.count_person) <span class="kw">as</span> <span class="ot">&quot;Person_count&quot;</span>,</span>
-<span id="cb67-9"><a href="concepts-browser-deprecated.html#cb67-9" aria-hidden="true"></a>    <span class="cf">CASE</span> </span>
-<span id="cb67-10"><a href="concepts-browser-deprecated.html#cb67-10" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">10</span> <span class="cf">THEN</span> <span class="st">&#39;&lt;=10&#39;</span></span>
-<span id="cb67-11"><a href="concepts-browser-deprecated.html#cb67-11" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">100</span> <span class="cf">THEN</span> <span class="st">&#39;11-10ˆ2&#39;</span></span>
-<span id="cb67-12"><a href="concepts-browser-deprecated.html#cb67-12" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">1000</span> <span class="cf">THEN</span> <span class="st">&#39;10ˆ2-10ˆ3&#39;</span></span>
-<span id="cb67-13"><a href="concepts-browser-deprecated.html#cb67-13" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">10000</span> <span class="cf">THEN</span> <span class="st">&#39;10ˆ3-10ˆ4&#39;</span></span>
-<span id="cb67-14"><a href="concepts-browser-deprecated.html#cb67-14" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">100000</span> <span class="cf">THEN</span> <span class="st">&#39;10ˆ4-10ˆ5&#39;</span></span>
-<span id="cb67-15"><a href="concepts-browser-deprecated.html#cb67-15" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">1000000</span> <span class="cf">THEN</span> <span class="st">&#39;10ˆ5-10ˆ6&#39;</span></span>
-<span id="cb67-16"><a href="concepts-browser-deprecated.html#cb67-16" aria-hidden="true"></a>        <span class="cf">ELSE</span> <span class="st">&#39;&gt;10ˆ6&#39;</span></span>
-<span id="cb67-17"><a href="concepts-browser-deprecated.html#cb67-17" aria-hidden="true"></a>    <span class="cf">END</span> <span class="kw">as</span> <span class="ot">&quot;magnitude_occurrences&quot;</span>,</span>
-<span id="cb67-18"><a href="concepts-browser-deprecated.html#cb67-18" aria-hidden="true"></a>    <span class="cf">CASE</span> </span>
-<span id="cb67-19"><a href="concepts-browser-deprecated.html#cb67-19" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">10</span> <span class="cf">THEN</span> <span class="st">&#39;&lt;=10&#39;</span></span>
-<span id="cb67-20"><a href="concepts-browser-deprecated.html#cb67-20" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">100</span> <span class="cf">THEN</span> <span class="st">&#39;11-10ˆ2&#39;</span></span>
-<span id="cb67-21"><a href="concepts-browser-deprecated.html#cb67-21" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">1000</span> <span class="cf">THEN</span> <span class="st">&#39;10ˆ2-10ˆ3&#39;</span></span>
-<span id="cb67-22"><a href="concepts-browser-deprecated.html#cb67-22" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">10000</span> <span class="cf">THEN</span> <span class="st">&#39;10ˆ3-10ˆ4&#39;</span></span>
-<span id="cb67-23"><a href="concepts-browser-deprecated.html#cb67-23" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">100000</span> <span class="cf">THEN</span> <span class="st">&#39;10ˆ4-10ˆ5&#39;</span></span>
-<span id="cb67-24"><a href="concepts-browser-deprecated.html#cb67-24" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">1000000</span> <span class="cf">THEN</span> <span class="st">&#39;10ˆ5-10ˆ6&#39;</span></span>
-<span id="cb67-25"><a href="concepts-browser-deprecated.html#cb67-25" aria-hidden="true"></a>        <span class="cf">ELSE</span> <span class="st">&#39;&gt;10ˆ6&#39;</span></span>
-<span id="cb67-26"><a href="concepts-browser-deprecated.html#cb67-26" aria-hidden="true"></a>    <span class="cf">END</span> <span class="kw">AS</span> <span class="ot">&quot;magnitude_persons&quot;</span></span>
-<span id="cb67-27"><a href="concepts-browser-deprecated.html#cb67-27" aria-hidden="true"></a><span class="kw">FROM</span> (<span class="kw">SELECT</span> analysis_id,</span>
-<span id="cb67-28"><a href="concepts-browser-deprecated.html#cb67-28" aria-hidden="true"></a>             stratum_1 concept_id,</span>
-<span id="cb67-29"><a href="concepts-browser-deprecated.html#cb67-29" aria-hidden="true"></a>             data_source_id,</span>
-<span id="cb67-30"><a href="concepts-browser-deprecated.html#cb67-30" aria-hidden="true"></a>             concept_name,</span>
-<span id="cb67-31"><a href="concepts-browser-deprecated.html#cb67-31" aria-hidden="true"></a>             domain_id,</span>
-<span id="cb67-32"><a href="concepts-browser-deprecated.html#cb67-32" aria-hidden="true"></a>             count_value, <span class="dv">0</span> <span class="kw">as</span> count_person</span>
-<span id="cb67-33"><a href="concepts-browser-deprecated.html#cb67-33" aria-hidden="true"></a>    <span class="kw">FROM</span> achilles_results</span>
-<span id="cb67-34"><a href="concepts-browser-deprecated.html#cb67-34" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept <span class="kw">ON</span> <span class="fu">cast</span>(stratum_1 <span class="kw">AS</span> BIGINT)<span class="op">=</span>concept_id</span>
-<span id="cb67-35"><a href="concepts-browser-deprecated.html#cb67-35" aria-hidden="true"></a>    <span class="kw">WHERE</span> analysis_id <span class="kw">in</span> (<span class="dv">201</span>, <span class="dv">301</span>, <span class="dv">401</span>, <span class="dv">601</span>, <span class="dv">701</span>, <span class="dv">801</span>, <span class="dv">901</span>, <span class="dv">1001</span>, <span class="dv">1801</span>)</span>
-<span id="cb67-36"><a href="concepts-browser-deprecated.html#cb67-36" aria-hidden="true"></a>    <span class="kw">UNION</span> (<span class="kw">SELECT</span>  analysis_id,</span>
-<span id="cb67-37"><a href="concepts-browser-deprecated.html#cb67-37" aria-hidden="true"></a>                   stratum_1 concept_id,</span>
-<span id="cb67-38"><a href="concepts-browser-deprecated.html#cb67-38" aria-hidden="true"></a>                   data_source_id,</span>
-<span id="cb67-39"><a href="concepts-browser-deprecated.html#cb67-39" aria-hidden="true"></a>                   concept_name,</span>
-<span id="cb67-40"><a href="concepts-browser-deprecated.html#cb67-40" aria-hidden="true"></a>                   domain_id,</span>
-<span id="cb67-41"><a href="concepts-browser-deprecated.html#cb67-41" aria-hidden="true"></a>                   <span class="dv">0</span> <span class="kw">as</span> count_value,</span>
-<span id="cb67-42"><a href="concepts-browser-deprecated.html#cb67-42" aria-hidden="true"></a>                   <span class="fu">sum</span>(count_value) <span class="kw">as</span> count_person</span>
-<span id="cb67-43"><a href="concepts-browser-deprecated.html#cb67-43" aria-hidden="true"></a>            <span class="kw">FROM</span>  achilles_results</span>
-<span id="cb67-44"><a href="concepts-browser-deprecated.html#cb67-44" aria-hidden="true"></a>            <span class="kw">JOIN</span> concept <span class="kw">on</span> <span class="fu">cast</span>(stratum_1 <span class="kw">as</span> BIGINT)<span class="op">=</span>concept_id</span>
-<span id="cb67-45"><a href="concepts-browser-deprecated.html#cb67-45" aria-hidden="true"></a>            <span class="kw">WHERE</span> analysis_id <span class="kw">in</span> (<span class="dv">202</span>, <span class="dv">401</span>, <span class="dv">601</span>, <span class="dv">701</span>, <span class="dv">801</span>, <span class="dv">901</span>, <span class="dv">1001</span>, <span class="dv">1801</span>)</span>
-<span id="cb67-46"><a href="concepts-browser-deprecated.html#cb67-46" aria-hidden="true"></a>            <span class="kw">GROUP</span> <span class="kw">BY</span> analysis_id,stratum_1,data_source_id,concept_name,domain_id) ) <span class="kw">as</span> q1</span>
-<span id="cb67-47"><a href="concepts-browser-deprecated.html#cb67-47" aria-hidden="true"></a>    <span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> q1.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb67-48"><a href="concepts-browser-deprecated.html#cb67-48" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span> q1.concept_id,q1.concept_name,q1.domain_id,<span class="kw">source</span>.name, acronym</span>
-<span id="cb67-49"><a href="concepts-browser-deprecated.html#cb67-49" aria-hidden="true"></a><span class="kw">ORDER</span> <span class="kw">BY</span> <span class="ot">&quot;Person_count&quot;</span> <span class="kw">desc</span></span></code></pre></div>
+<div class="sourceCode" id="cb66"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb66-1"><a href="concepts-browser-deprecated.html#cb66-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
+<span id="cb66-2"><a href="concepts-browser-deprecated.html#cb66-2" aria-hidden="true"></a>    q1.concept_id <span class="kw">AS</span> concept_id,</span>
+<span id="cb66-3"><a href="concepts-browser-deprecated.html#cb66-3" aria-hidden="true"></a>    q1.concept_name <span class="kw">AS</span> concept_name,</span>
+<span id="cb66-4"><a href="concepts-browser-deprecated.html#cb66-4" aria-hidden="true"></a>    q1.domain_id,</span>
+<span id="cb66-5"><a href="concepts-browser-deprecated.html#cb66-5" aria-hidden="true"></a>    <span class="kw">source</span>.name <span class="kw">AS</span> source_name,</span>
+<span id="cb66-6"><a href="concepts-browser-deprecated.html#cb66-6" aria-hidden="true"></a>    <span class="kw">source</span>.acronym,</span>
+<span id="cb66-7"><a href="concepts-browser-deprecated.html#cb66-7" aria-hidden="true"></a>    <span class="fu">sum</span>(q1.count_value) <span class="kw">as</span> <span class="ot">&quot;Occurrence_count&quot;</span>,</span>
+<span id="cb66-8"><a href="concepts-browser-deprecated.html#cb66-8" aria-hidden="true"></a>    <span class="fu">sum</span>(q1.count_person) <span class="kw">as</span> <span class="ot">&quot;Person_count&quot;</span>,</span>
+<span id="cb66-9"><a href="concepts-browser-deprecated.html#cb66-9" aria-hidden="true"></a>    <span class="cf">CASE</span> </span>
+<span id="cb66-10"><a href="concepts-browser-deprecated.html#cb66-10" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">10</span></span>
+<span id="cb66-11"><a href="concepts-browser-deprecated.html#cb66-11" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;&lt;=10&#39;</span></span>
+<span id="cb66-12"><a href="concepts-browser-deprecated.html#cb66-12" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">100</span></span>
+<span id="cb66-13"><a href="concepts-browser-deprecated.html#cb66-13" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;11-10ˆ2&#39;</span></span>
+<span id="cb66-14"><a href="concepts-browser-deprecated.html#cb66-14" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">1000</span></span>
+<span id="cb66-15"><a href="concepts-browser-deprecated.html#cb66-15" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;10ˆ2-10ˆ3&#39;</span></span>
+<span id="cb66-16"><a href="concepts-browser-deprecated.html#cb66-16" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">10000</span></span>
+<span id="cb66-17"><a href="concepts-browser-deprecated.html#cb66-17" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;10ˆ3-10ˆ4&#39;</span></span>
+<span id="cb66-18"><a href="concepts-browser-deprecated.html#cb66-18" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">100000</span></span>
+<span id="cb66-19"><a href="concepts-browser-deprecated.html#cb66-19" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;10ˆ4-10ˆ5&#39;</span></span>
+<span id="cb66-20"><a href="concepts-browser-deprecated.html#cb66-20" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_value)<span class="op">&lt;=</span><span class="dv">1000000</span></span>
+<span id="cb66-21"><a href="concepts-browser-deprecated.html#cb66-21" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;10ˆ5-10ˆ6&#39;</span></span>
+<span id="cb66-22"><a href="concepts-browser-deprecated.html#cb66-22" aria-hidden="true"></a>        <span class="cf">ELSE</span> <span class="st">&#39;&gt;10ˆ6&#39;</span></span>
+<span id="cb66-23"><a href="concepts-browser-deprecated.html#cb66-23" aria-hidden="true"></a>    <span class="cf">END</span> <span class="kw">as</span> <span class="ot">&quot;magnitude_occurrences&quot;</span>,</span>
+<span id="cb66-24"><a href="concepts-browser-deprecated.html#cb66-24" aria-hidden="true"></a>    <span class="cf">CASE</span> </span>
+<span id="cb66-25"><a href="concepts-browser-deprecated.html#cb66-25" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">10</span></span>
+<span id="cb66-26"><a href="concepts-browser-deprecated.html#cb66-26" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;&lt;=10&#39;</span></span>
+<span id="cb66-27"><a href="concepts-browser-deprecated.html#cb66-27" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">100</span></span>
+<span id="cb66-28"><a href="concepts-browser-deprecated.html#cb66-28" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;11-10ˆ2&#39;</span></span>
+<span id="cb66-29"><a href="concepts-browser-deprecated.html#cb66-29" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">1000</span></span>
+<span id="cb66-30"><a href="concepts-browser-deprecated.html#cb66-30" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;10ˆ2-10ˆ3&#39;</span></span>
+<span id="cb66-31"><a href="concepts-browser-deprecated.html#cb66-31" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">10000</span></span>
+<span id="cb66-32"><a href="concepts-browser-deprecated.html#cb66-32" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;10ˆ3-10ˆ4&#39;</span></span>
+<span id="cb66-33"><a href="concepts-browser-deprecated.html#cb66-33" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">100000</span></span>
+<span id="cb66-34"><a href="concepts-browser-deprecated.html#cb66-34" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;10ˆ4-10ˆ5&#39;</span></span>
+<span id="cb66-35"><a href="concepts-browser-deprecated.html#cb66-35" aria-hidden="true"></a>        <span class="cf">WHEN</span> <span class="fu">sum</span>(q1.count_person)<span class="op">&lt;=</span><span class="dv">1000000</span></span>
+<span id="cb66-36"><a href="concepts-browser-deprecated.html#cb66-36" aria-hidden="true"></a>          <span class="cf">THEN</span> <span class="st">&#39;10ˆ5-10ˆ6&#39;</span></span>
+<span id="cb66-37"><a href="concepts-browser-deprecated.html#cb66-37" aria-hidden="true"></a>        <span class="cf">ELSE</span> <span class="st">&#39;&gt;10ˆ6&#39;</span></span>
+<span id="cb66-38"><a href="concepts-browser-deprecated.html#cb66-38" aria-hidden="true"></a>    <span class="cf">END</span> <span class="kw">AS</span> <span class="ot">&quot;magnitude_persons&quot;</span></span>
+<span id="cb66-39"><a href="concepts-browser-deprecated.html#cb66-39" aria-hidden="true"></a><span class="kw">FROM</span> (<span class="kw">SELECT</span> analysis_id,</span>
+<span id="cb66-40"><a href="concepts-browser-deprecated.html#cb66-40" aria-hidden="true"></a>             stratum_1 concept_id,</span>
+<span id="cb66-41"><a href="concepts-browser-deprecated.html#cb66-41" aria-hidden="true"></a>             data_source_id,</span>
+<span id="cb66-42"><a href="concepts-browser-deprecated.html#cb66-42" aria-hidden="true"></a>             concept_name,</span>
+<span id="cb66-43"><a href="concepts-browser-deprecated.html#cb66-43" aria-hidden="true"></a>             domain_id,</span>
+<span id="cb66-44"><a href="concepts-browser-deprecated.html#cb66-44" aria-hidden="true"></a>             count_value, <span class="dv">0</span> <span class="kw">as</span> count_person</span>
+<span id="cb66-45"><a href="concepts-browser-deprecated.html#cb66-45" aria-hidden="true"></a>    <span class="kw">FROM</span> achilles_results</span>
+<span id="cb66-46"><a href="concepts-browser-deprecated.html#cb66-46" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept</span>
+<span id="cb66-47"><a href="concepts-browser-deprecated.html#cb66-47" aria-hidden="true"></a>      <span class="kw">ON</span> <span class="fu">cast</span>(stratum_1 <span class="kw">AS</span> BIGINT)<span class="op">=</span>concept_id</span>
+<span id="cb66-48"><a href="concepts-browser-deprecated.html#cb66-48" aria-hidden="true"></a>    <span class="kw">WHERE</span></span>
+<span id="cb66-49"><a href="concepts-browser-deprecated.html#cb66-49" aria-hidden="true"></a>      analysis_id <span class="kw">in</span> (</span>
+<span id="cb66-50"><a href="concepts-browser-deprecated.html#cb66-50" aria-hidden="true"></a>        <span class="dv">201</span>, <span class="dv">301</span>, <span class="dv">401</span>, <span class="dv">601</span>, <span class="dv">701</span>, <span class="dv">801</span>, <span class="dv">901</span>, <span class="dv">1001</span>,</span>
+<span id="cb66-51"><a href="concepts-browser-deprecated.html#cb66-51" aria-hidden="true"></a>        <span class="dv">1801</span></span>
+<span id="cb66-52"><a href="concepts-browser-deprecated.html#cb66-52" aria-hidden="true"></a>      )</span>
+<span id="cb66-53"><a href="concepts-browser-deprecated.html#cb66-53" aria-hidden="true"></a>    <span class="kw">UNION</span> (<span class="kw">SELECT</span>  analysis_id,</span>
+<span id="cb66-54"><a href="concepts-browser-deprecated.html#cb66-54" aria-hidden="true"></a>                   stratum_1 concept_id,</span>
+<span id="cb66-55"><a href="concepts-browser-deprecated.html#cb66-55" aria-hidden="true"></a>                   data_source_id,</span>
+<span id="cb66-56"><a href="concepts-browser-deprecated.html#cb66-56" aria-hidden="true"></a>                   concept_name,</span>
+<span id="cb66-57"><a href="concepts-browser-deprecated.html#cb66-57" aria-hidden="true"></a>                   domain_id,</span>
+<span id="cb66-58"><a href="concepts-browser-deprecated.html#cb66-58" aria-hidden="true"></a>                   <span class="dv">0</span> <span class="kw">as</span> count_value,</span>
+<span id="cb66-59"><a href="concepts-browser-deprecated.html#cb66-59" aria-hidden="true"></a>                   <span class="fu">sum</span>(count_value) <span class="kw">as</span> count_person</span>
+<span id="cb66-60"><a href="concepts-browser-deprecated.html#cb66-60" aria-hidden="true"></a>            <span class="kw">FROM</span>  achilles_results</span>
+<span id="cb66-61"><a href="concepts-browser-deprecated.html#cb66-61" aria-hidden="true"></a>            <span class="kw">JOIN</span> concept</span>
+<span id="cb66-62"><a href="concepts-browser-deprecated.html#cb66-62" aria-hidden="true"></a>              <span class="kw">ON</span> <span class="fu">cast</span>(stratum_1 <span class="kw">as</span> BIGINT)<span class="op">=</span>concept_id</span>
+<span id="cb66-63"><a href="concepts-browser-deprecated.html#cb66-63" aria-hidden="true"></a>            <span class="kw">WHERE</span></span>
+<span id="cb66-64"><a href="concepts-browser-deprecated.html#cb66-64" aria-hidden="true"></a>              analysis_id <span class="kw">in</span> (</span>
+<span id="cb66-65"><a href="concepts-browser-deprecated.html#cb66-65" aria-hidden="true"></a>                <span class="dv">202</span>, <span class="dv">401</span>, <span class="dv">601</span>, <span class="dv">701</span>, <span class="dv">801</span>, <span class="dv">901</span>, <span class="dv">1001</span>, <span class="dv">1801</span></span>
+<span id="cb66-66"><a href="concepts-browser-deprecated.html#cb66-66" aria-hidden="true"></a>              )</span>
+<span id="cb66-67"><a href="concepts-browser-deprecated.html#cb66-67" aria-hidden="true"></a>            <span class="kw">GROUP</span> <span class="kw">BY</span></span>
+<span id="cb66-68"><a href="concepts-browser-deprecated.html#cb66-68" aria-hidden="true"></a>              analysis_id,</span>
+<span id="cb66-69"><a href="concepts-browser-deprecated.html#cb66-69" aria-hidden="true"></a>              stratum_1,</span>
+<span id="cb66-70"><a href="concepts-browser-deprecated.html#cb66-70" aria-hidden="true"></a>              data_source_id,</span>
+<span id="cb66-71"><a href="concepts-browser-deprecated.html#cb66-71" aria-hidden="true"></a>              concept_name,</span>
+<span id="cb66-72"><a href="concepts-browser-deprecated.html#cb66-72" aria-hidden="true"></a>              domain_id</span>
+<span id="cb66-73"><a href="concepts-browser-deprecated.html#cb66-73" aria-hidden="true"></a>            )) <span class="kw">as</span> q1</span>
+<span id="cb66-74"><a href="concepts-browser-deprecated.html#cb66-74" aria-hidden="true"></a>    <span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb66-75"><a href="concepts-browser-deprecated.html#cb66-75" aria-hidden="true"></a>      <span class="kw">ON</span> q1.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb66-76"><a href="concepts-browser-deprecated.html#cb66-76" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span></span>
+<span id="cb66-77"><a href="concepts-browser-deprecated.html#cb66-77" aria-hidden="true"></a>  q1.concept_id,</span>
+<span id="cb66-78"><a href="concepts-browser-deprecated.html#cb66-78" aria-hidden="true"></a>  q1.concept_name,</span>
+<span id="cb66-79"><a href="concepts-browser-deprecated.html#cb66-79" aria-hidden="true"></a>  q1.domain_id,</span>
+<span id="cb66-80"><a href="concepts-browser-deprecated.html#cb66-80" aria-hidden="true"></a>  <span class="kw">source</span>.name,</span>
+<span id="cb66-81"><a href="concepts-browser-deprecated.html#cb66-81" aria-hidden="true"></a>  acronym</span>
+<span id="cb66-82"><a href="concepts-browser-deprecated.html#cb66-82" aria-hidden="true"></a><span class="kw">ORDER</span> <span class="kw">BY</span> <span class="ot">&quot;Person_count&quot;</span> <span class="kw">desc</span></span></code></pre></div>
 <div id="chart-settings-24" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
 <ul>
diff --git a/docs/customizations.html b/docs/customizations.html
index ce20a670..f46c1255 100644
--- a/docs/customizations.html
+++ b/docs/customizations.html
@@ -24,14 +24,14 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="apple-mobile-web-app-status-bar-style" content="black" />
   
   
-<link rel="prev" href="useful-stuff.html"/>
+<link rel="prev" href="backups.html"/>
 <link rel="next" href="development-instructions.html"/>
 <script src="libs/header-attrs-2.11/header-attrs.js"></script>
 <script src="libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -369,7 +369,7 @@ <h3>Allow Draft Status Updates</h3>
           </div>
         </div>
       </div>
-<a href="useful-stuff.html" class="navigation navigation-prev " aria-label="Previous page"><i class="fa fa-angle-left"></i></a>
+<a href="backups.html" class="navigation navigation-prev " aria-label="Previous page"><i class="fa fa-angle-left"></i></a>
 <a href="development-instructions.html" class="navigation navigation-next " aria-label="Next page"><i class="fa fa-angle-right"></i></a>
     </div>
   </div>
diff --git a/docs/dashboards.html b/docs/dashboards.html
index c0247f52..e78d4b52 100644
--- a/docs/dashboards.html
+++ b/docs/dashboards.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
diff --git a/docs/data-domains-deprecated.html b/docs/data-domains-deprecated.html
index eaa800b5..ee721395 100644
--- a/docs/data-domains-deprecated.html
+++ b/docs/data-domains-deprecated.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -329,9 +329,9 @@ <h2><span class="header-section-number">9.11</span> Data Domains [Deprecated]</h
 <div id="css-9" class="section level3 unnumbered" number="">
 <h3>CSS</h3>
 <p>To hide the dashboard header insert the following css code to the <code>CSS</code> field on the edit page:</p>
-<div class="sourceCode" id="cb70"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb70-1"><a href="data-domains-deprecated.html#cb70-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
-<span id="cb70-2"><a href="data-domains-deprecated.html#cb70-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb70-3"><a href="data-domains-deprecated.html#cb70-3" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb69"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb69-1"><a href="data-domains-deprecated.html#cb69-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
+<span id="cb69-2"><a href="data-domains-deprecated.html#cb69-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb69-3"><a href="data-domains-deprecated.html#cb69-3" aria-hidden="true"></a>}</span></code></pre></div>
 <p>With this every time you want to edit the dashboard layout you have to either comment the CSS inserted
 or remove it so the “Edit Dashboard” button can show again.</p>
 </div>
@@ -374,8 +374,8 @@ <h4>Chart settings</h4>
 </ul>
 </div>
 </div>
-<div id="average-number-of-records-per-person-avgrecordsperperson" class="section level3 unnumbered" number="">
-<h3>Average Number of Records per Person {#avgRecordsPerPerson}</h3>
+<div id="avgRecordsPerPerson" class="section level3 unnumbered" number="">
+<h3>Average Number of Records per Person</h3>
 <div class="figure"><span style="display:block;" id="fig:unnamed-chunk-1"></span>
 <img src="images/10-data_domain/02-avg_records_per_person.png" alt="Settings for creating the Data Source filter chart" width="100%" />
 <p class="caption">
@@ -384,29 +384,45 @@ <h3>Average Number of Records per Person {#avgRecordsPerPerson}</h3>
 </div>
 <div id="sql-query-26" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb71"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb71-1"><a href="data-domains-deprecated.html#cb71-1" aria-hidden="true"></a><span class="kw">SELECT</span> </span>
-<span id="cb71-2"><a href="data-domains-deprecated.html#cb71-2" aria-hidden="true"></a>    <span class="kw">source</span>.name,</span>
-<span id="cb71-3"><a href="data-domains-deprecated.html#cb71-3" aria-hidden="true"></a>    <span class="kw">source</span>.acronym,</span>
-<span id="cb71-4"><a href="data-domains-deprecated.html#cb71-4" aria-hidden="true"></a>    <span class="cf">CASE</span> </span>
-<span id="cb71-5"><a href="data-domains-deprecated.html#cb71-5" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">201</span> <span class="cf">THEN</span> <span class="st">&#39;Visit&#39;</span></span>
-<span id="cb71-6"><a href="data-domains-deprecated.html#cb71-6" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">401</span> <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span></span>
-<span id="cb71-7"><a href="data-domains-deprecated.html#cb71-7" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">501</span> <span class="cf">THEN</span> <span class="st">&#39;Death&#39;</span></span>
-<span id="cb71-8"><a href="data-domains-deprecated.html#cb71-8" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">601</span> <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span></span>
-<span id="cb71-9"><a href="data-domains-deprecated.html#cb71-9" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">701</span> <span class="cf">THEN</span> <span class="st">&#39;Drug Exposure&#39;</span></span>
-<span id="cb71-10"><a href="data-domains-deprecated.html#cb71-10" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">801</span> <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span></span>
-<span id="cb71-11"><a href="data-domains-deprecated.html#cb71-11" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">1801</span> <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span></span>
-<span id="cb71-12"><a href="data-domains-deprecated.html#cb71-12" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">2101</span> <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span></span>
-<span id="cb71-13"><a href="data-domains-deprecated.html#cb71-13" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">2201</span> <span class="cf">THEN</span> <span class="st">&#39;Note&#39;</span></span>
-<span id="cb71-14"><a href="data-domains-deprecated.html#cb71-14" aria-hidden="true"></a>    <span class="cf">END</span> <span class="kw">AS</span> Data_Domain,</span>
-<span id="cb71-15"><a href="data-domains-deprecated.html#cb71-15" aria-hidden="true"></a>    <span class="fu">SUM</span>(count_value) <span class="op">/</span><span class="fu">AVG</span>(num_persons) <span class="kw">AS</span> <span class="ot">&quot;records_per_person&quot;</span></span>
-<span id="cb71-16"><a href="data-domains-deprecated.html#cb71-16" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb71-17"><a href="data-domains-deprecated.html#cb71-17" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb71-18"><a href="data-domains-deprecated.html#cb71-18" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> (</span>
-<span id="cb71-19"><a href="data-domains-deprecated.html#cb71-19" aria-hidden="true"></a>  <span class="kw">SELECT</span> data_source_id , count_value <span class="kw">as</span> num_persons</span>
-<span id="cb71-20"><a href="data-domains-deprecated.html#cb71-20" aria-hidden="true"></a>  <span class="kw">FROM</span> achilles_results</span>
-<span id="cb71-21"><a href="data-domains-deprecated.html#cb71-21" aria-hidden="true"></a>  <span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">1</span>) counts <span class="kw">ON</span> achilles.data_source_id <span class="op">=</span> counts.data_source_id </span>
-<span id="cb71-22"><a href="data-domains-deprecated.html#cb71-22" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span> analysis_id, <span class="kw">source</span>.name, <span class="kw">source</span>.acronym</span>
-<span id="cb71-23"><a href="data-domains-deprecated.html#cb71-23" aria-hidden="true"></a><span class="kw">HAVING</span> analysis_id <span class="kw">IN</span> (<span class="dv">201</span>, <span class="dv">401</span>, <span class="dv">501</span>, <span class="dv">601</span>, <span class="dv">701</span>, <span class="dv">801</span>, <span class="dv">1801</span>, <span class="dv">2101</span>, <span class="dv">2201</span>)</span></code></pre></div>
+<div class="sourceCode" id="cb70"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb70-1"><a href="data-domains-deprecated.html#cb70-1" aria-hidden="true"></a><span class="kw">SELECT</span> </span>
+<span id="cb70-2"><a href="data-domains-deprecated.html#cb70-2" aria-hidden="true"></a>    <span class="kw">source</span>.name,</span>
+<span id="cb70-3"><a href="data-domains-deprecated.html#cb70-3" aria-hidden="true"></a>    <span class="kw">source</span>.acronym,</span>
+<span id="cb70-4"><a href="data-domains-deprecated.html#cb70-4" aria-hidden="true"></a>    <span class="cf">CASE</span> </span>
+<span id="cb70-5"><a href="data-domains-deprecated.html#cb70-5" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">201</span></span>
+<span id="cb70-6"><a href="data-domains-deprecated.html#cb70-6" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Visit&#39;</span></span>
+<span id="cb70-7"><a href="data-domains-deprecated.html#cb70-7" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">401</span></span>
+<span id="cb70-8"><a href="data-domains-deprecated.html#cb70-8" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span></span>
+<span id="cb70-9"><a href="data-domains-deprecated.html#cb70-9" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">501</span></span>
+<span id="cb70-10"><a href="data-domains-deprecated.html#cb70-10" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Death&#39;</span></span>
+<span id="cb70-11"><a href="data-domains-deprecated.html#cb70-11" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">601</span></span>
+<span id="cb70-12"><a href="data-domains-deprecated.html#cb70-12" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span></span>
+<span id="cb70-13"><a href="data-domains-deprecated.html#cb70-13" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">701</span></span>
+<span id="cb70-14"><a href="data-domains-deprecated.html#cb70-14" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Drug Exposure&#39;</span></span>
+<span id="cb70-15"><a href="data-domains-deprecated.html#cb70-15" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">801</span></span>
+<span id="cb70-16"><a href="data-domains-deprecated.html#cb70-16" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span></span>
+<span id="cb70-17"><a href="data-domains-deprecated.html#cb70-17" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">1801</span></span>
+<span id="cb70-18"><a href="data-domains-deprecated.html#cb70-18" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span></span>
+<span id="cb70-19"><a href="data-domains-deprecated.html#cb70-19" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">2101</span></span>
+<span id="cb70-20"><a href="data-domains-deprecated.html#cb70-20" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span></span>
+<span id="cb70-21"><a href="data-domains-deprecated.html#cb70-21" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">2201</span></span>
+<span id="cb70-22"><a href="data-domains-deprecated.html#cb70-22" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Note&#39;</span></span>
+<span id="cb70-23"><a href="data-domains-deprecated.html#cb70-23" aria-hidden="true"></a>    <span class="cf">END</span> <span class="kw">AS</span> Data_Domain,</span>
+<span id="cb70-24"><a href="data-domains-deprecated.html#cb70-24" aria-hidden="true"></a>    <span class="fu">SUM</span>(count_value) <span class="op">/</span><span class="fu">AVG</span>(num_persons)</span>
+<span id="cb70-25"><a href="data-domains-deprecated.html#cb70-25" aria-hidden="true"></a>      <span class="kw">AS</span> <span class="ot">&quot;records_per_person&quot;</span></span>
+<span id="cb70-26"><a href="data-domains-deprecated.html#cb70-26" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb70-27"><a href="data-domains-deprecated.html#cb70-27" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb70-28"><a href="data-domains-deprecated.html#cb70-28" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb70-29"><a href="data-domains-deprecated.html#cb70-29" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> (</span>
+<span id="cb70-30"><a href="data-domains-deprecated.html#cb70-30" aria-hidden="true"></a>  <span class="kw">SELECT</span> data_source_id , count_value <span class="kw">as</span> num_persons</span>
+<span id="cb70-31"><a href="data-domains-deprecated.html#cb70-31" aria-hidden="true"></a>  <span class="kw">FROM</span> achilles_results</span>
+<span id="cb70-32"><a href="data-domains-deprecated.html#cb70-32" aria-hidden="true"></a>  <span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">1</span>) counts</span>
+<span id="cb70-33"><a href="data-domains-deprecated.html#cb70-33" aria-hidden="true"></a>    <span class="kw">ON</span> achilles.data_source_id <span class="op">=</span> counts.data_source_id</span>
+<span id="cb70-34"><a href="data-domains-deprecated.html#cb70-34" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span> analysis_id, <span class="kw">source</span>.name, <span class="kw">source</span>.acronym</span>
+<span id="cb70-35"><a href="data-domains-deprecated.html#cb70-35" aria-hidden="true"></a><span class="kw">HAVING</span></span>
+<span id="cb70-36"><a href="data-domains-deprecated.html#cb70-36" aria-hidden="true"></a>  analysis_id <span class="kw">IN</span> (</span>
+<span id="cb70-37"><a href="data-domains-deprecated.html#cb70-37" aria-hidden="true"></a>    <span class="dv">201</span>, <span class="dv">401</span>, <span class="dv">501</span>, <span class="dv">601</span>, <span class="dv">701</span>, <span class="dv">801</span>, <span class="dv">1801</span>, <span class="dv">2101</span>,</span>
+<span id="cb70-38"><a href="data-domains-deprecated.html#cb70-38" aria-hidden="true"></a>    <span class="dv">2201</span></span>
+<span id="cb70-39"><a href="data-domains-deprecated.html#cb70-39" aria-hidden="true"></a>  )</span></code></pre></div>
 </div>
 <div id="chart-settings-28" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
diff --git a/docs/database-level-dashboard.html b/docs/database-level-dashboard.html
index 8c702148..fc7f4050 100644
--- a/docs/database-level-dashboard.html
+++ b/docs/database-level-dashboard.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -333,39 +333,39 @@ <h2><span class="header-section-number">9.2</span> Database-Level Dashboard</h2>
 <h3>Label Colors</h3>
 <p>In order to obtain the colors blue and rose in the chart representing the gender distribution,
 add the following JSON entry to the JSON object of the <code>JSON Metadata</code> field on the edit dashboard page:</p>
-<div class="sourceCode" id="cb15"><pre class="sourceCode json"><code class="sourceCode json"><span id="cb15-1"><a href="database-level-dashboard.html#cb15-1" aria-hidden="true"></a><span class="er">&quot;label_colors&quot;:</span> <span class="fu">{</span></span>
-<span id="cb15-2"><a href="database-level-dashboard.html#cb15-2" aria-hidden="true"></a>    <span class="dt">&quot;Male&quot;</span><span class="fu">:</span> <span class="st">&quot;#3366FF&quot;</span><span class="fu">,</span></span>
-<span id="cb15-3"><a href="database-level-dashboard.html#cb15-3" aria-hidden="true"></a>    <span class="dt">&quot;Female&quot;</span><span class="fu">:</span> <span class="st">&quot;#FF3399&quot;</span></span>
-<span id="cb15-4"><a href="database-level-dashboard.html#cb15-4" aria-hidden="true"></a><span class="fu">}</span></span></code></pre></div>
+<div class="sourceCode" id="cb14"><pre class="sourceCode json"><code class="sourceCode json"><span id="cb14-1"><a href="database-level-dashboard.html#cb14-1" aria-hidden="true"></a><span class="er">&quot;label_colors&quot;:</span> <span class="fu">{</span></span>
+<span id="cb14-2"><a href="database-level-dashboard.html#cb14-2" aria-hidden="true"></a>    <span class="dt">&quot;Male&quot;</span><span class="fu">:</span> <span class="st">&quot;#3366FF&quot;</span><span class="fu">,</span></span>
+<span id="cb14-3"><a href="database-level-dashboard.html#cb14-3" aria-hidden="true"></a>    <span class="dt">&quot;Female&quot;</span><span class="fu">:</span> <span class="st">&quot;#FF3399&quot;</span></span>
+<span id="cb14-4"><a href="database-level-dashboard.html#cb14-4" aria-hidden="true"></a><span class="fu">}</span></span></code></pre></div>
 </div>
 <div id="css-1" class="section level3 unnumbered" number="">
 <h3>CSS</h3>
 <p>To hide the dashboard header insert the following css code to the <code>CSS</code> field on the edit page:</p>
-<div class="sourceCode" id="cb16"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb16-1"><a href="database-level-dashboard.html#cb16-1" aria-hidden="true"></a><span class="co">/* hides the filter badges on right side of charts */</span></span>
-<span id="cb16-2"><a href="database-level-dashboard.html#cb16-2" aria-hidden="true"></a><span class="fu">.dashboard-filter-indicators-container</span> {</span>
-<span id="cb16-3"><a href="database-level-dashboard.html#cb16-3" aria-hidden="true"></a>    <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb16-4"><a href="database-level-dashboard.html#cb16-4" aria-hidden="true"></a>}</span>
-<span id="cb16-5"><a href="database-level-dashboard.html#cb16-5" aria-hidden="true"></a></span>
-<span id="cb16-6"><a href="database-level-dashboard.html#cb16-6" aria-hidden="true"></a><span class="co">/* hides the acronym filter */</span></span>
-<span id="cb16-7"><a href="database-level-dashboard.html#cb16-7" aria-hidden="true"></a><span class="fu">.grid-content</span> <span class="op">&gt;</span> <span class="fu">.dragdroppable.dragdroppable-row</span> <span class="op">&gt;</span> <span class="fu">.with-popover-menu</span> {</span>
-<span id="cb16-8"><a href="database-level-dashboard.html#cb16-8" aria-hidden="true"></a>    <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb16-9"><a href="database-level-dashboard.html#cb16-9" aria-hidden="true"></a>}</span>
-<span id="cb16-10"><a href="database-level-dashboard.html#cb16-10" aria-hidden="true"></a></span>
-<span id="cb16-11"><a href="database-level-dashboard.html#cb16-11" aria-hidden="true"></a><span class="co">/*</span></span>
-<span id="cb16-12"><a href="database-level-dashboard.html#cb16-12" aria-hidden="true"></a><span class="co"> * </span><span class="al">WARNING</span><span class="co"> panel 1 id hardcoded</span></span>
-<span id="cb16-13"><a href="database-level-dashboard.html#cb16-13" aria-hidden="true"></a><span class="co"> * Hides the X Axis Label of the heatmap on the Data Domains tab</span></span>
-<span id="cb16-14"><a href="database-level-dashboard.html#cb16-14" aria-hidden="true"></a><span class="co"> */</span></span>
-<span id="cb16-15"><a href="database-level-dashboard.html#cb16-15" aria-hidden="true"></a><span class="pp">#TABS-nlIU6H5mcT-pane-1</span> g<span class="fu">.x.axis</span> <span class="op">&gt;</span> g<span class="fu">.tick</span> text {</span>
-<span id="cb16-16"><a href="database-level-dashboard.html#cb16-16" aria-hidden="true"></a>    <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb16-17"><a href="database-level-dashboard.html#cb16-17" aria-hidden="true"></a>}</span>
-<span id="cb16-18"><a href="database-level-dashboard.html#cb16-18" aria-hidden="true"></a></span>
-<span id="cb16-19"><a href="database-level-dashboard.html#cb16-19" aria-hidden="true"></a><span class="co">/*</span></span>
-<span id="cb16-20"><a href="database-level-dashboard.html#cb16-20" aria-hidden="true"></a><span class="co"> * </span><span class="al">WARNING</span><span class="co"> panel 2 id hardcoded</span></span>
-<span id="cb16-21"><a href="database-level-dashboard.html#cb16-21" aria-hidden="true"></a><span class="co"> * Hides the X Axis Labels of the bar charts on the Data Provenance tab</span></span>
-<span id="cb16-22"><a href="database-level-dashboard.html#cb16-22" aria-hidden="true"></a><span class="co"> */</span></span>
-<span id="cb16-23"><a href="database-level-dashboard.html#cb16-23" aria-hidden="true"></a><span class="pp">#TABS-nlIU6H5mcT-pane-2</span> g<span class="fu">.nv-x.nv-axis.nvd3-svg</span> <span class="op">&gt;</span> g<span class="fu">.nvd3.nv-wrap.nv-axis</span> <span class="op">&gt;</span> g <span class="op">&gt;</span> g<span class="fu">.tick.zero</span> <span class="op">&gt;</span> text {</span>
-<span id="cb16-24"><a href="database-level-dashboard.html#cb16-24" aria-hidden="true"></a>    <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb16-25"><a href="database-level-dashboard.html#cb16-25" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb15"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb15-1"><a href="database-level-dashboard.html#cb15-1" aria-hidden="true"></a><span class="co">/* hides the filter badges on right side of charts */</span></span>
+<span id="cb15-2"><a href="database-level-dashboard.html#cb15-2" aria-hidden="true"></a><span class="fu">.dashboard-filter-indicators-container</span> {</span>
+<span id="cb15-3"><a href="database-level-dashboard.html#cb15-3" aria-hidden="true"></a>    <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb15-4"><a href="database-level-dashboard.html#cb15-4" aria-hidden="true"></a>}</span>
+<span id="cb15-5"><a href="database-level-dashboard.html#cb15-5" aria-hidden="true"></a></span>
+<span id="cb15-6"><a href="database-level-dashboard.html#cb15-6" aria-hidden="true"></a><span class="co">/* hides the acronym filter */</span></span>
+<span id="cb15-7"><a href="database-level-dashboard.html#cb15-7" aria-hidden="true"></a><span class="fu">.grid-content</span> <span class="op">&gt;</span> <span class="fu">.dragdroppable.dragdroppable-row</span> <span class="op">&gt;</span> <span class="fu">.with-popover-menu</span> {</span>
+<span id="cb15-8"><a href="database-level-dashboard.html#cb15-8" aria-hidden="true"></a>    <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb15-9"><a href="database-level-dashboard.html#cb15-9" aria-hidden="true"></a>}</span>
+<span id="cb15-10"><a href="database-level-dashboard.html#cb15-10" aria-hidden="true"></a></span>
+<span id="cb15-11"><a href="database-level-dashboard.html#cb15-11" aria-hidden="true"></a><span class="co">/*</span></span>
+<span id="cb15-12"><a href="database-level-dashboard.html#cb15-12" aria-hidden="true"></a><span class="co"> * </span><span class="al">WARNING</span><span class="co"> panel 1 id hardcoded</span></span>
+<span id="cb15-13"><a href="database-level-dashboard.html#cb15-13" aria-hidden="true"></a><span class="co"> * Hides the X Axis Label of the heatmap on the Data Domains tab</span></span>
+<span id="cb15-14"><a href="database-level-dashboard.html#cb15-14" aria-hidden="true"></a><span class="co"> */</span></span>
+<span id="cb15-15"><a href="database-level-dashboard.html#cb15-15" aria-hidden="true"></a><span class="pp">#TABS-nlIU6H5mcT-pane-1</span> g<span class="fu">.x.axis</span> <span class="op">&gt;</span> g<span class="fu">.tick</span> text {</span>
+<span id="cb15-16"><a href="database-level-dashboard.html#cb15-16" aria-hidden="true"></a>    <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb15-17"><a href="database-level-dashboard.html#cb15-17" aria-hidden="true"></a>}</span>
+<span id="cb15-18"><a href="database-level-dashboard.html#cb15-18" aria-hidden="true"></a></span>
+<span id="cb15-19"><a href="database-level-dashboard.html#cb15-19" aria-hidden="true"></a><span class="co">/*</span></span>
+<span id="cb15-20"><a href="database-level-dashboard.html#cb15-20" aria-hidden="true"></a><span class="co"> * </span><span class="al">WARNING</span><span class="co"> panel 2 id hardcoded</span></span>
+<span id="cb15-21"><a href="database-level-dashboard.html#cb15-21" aria-hidden="true"></a><span class="co"> * Hides the X Axis Labels of the bar charts on the Data Provenance tab</span></span>
+<span id="cb15-22"><a href="database-level-dashboard.html#cb15-22" aria-hidden="true"></a><span class="co"> */</span></span>
+<span id="cb15-23"><a href="database-level-dashboard.html#cb15-23" aria-hidden="true"></a><span class="pp">#TABS-nlIU6H5mcT-pane-2</span> g<span class="fu">.nv-x.nv-axis.nvd3-svg</span> <span class="op">&gt;</span> g<span class="fu">.nvd3.nv-wrap.nv-axis</span> <span class="op">&gt;</span> g <span class="op">&gt;</span> g<span class="fu">.tick.zero</span> <span class="op">&gt;</span> text {</span>
+<span id="cb15-24"><a href="database-level-dashboard.html#cb15-24" aria-hidden="true"></a>    <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb15-25"><a href="database-level-dashboard.html#cb15-25" aria-hidden="true"></a>}</span></code></pre></div>
 <p>With this every time you want to edit the dashboard layout you have to either comment the CSS inserted
 or remove it so the “Edit Dashboard” button can show again.</p>
 </div>
diff --git a/docs/death-deprecated.html b/docs/death-deprecated.html
index 57a9340c..352fad95 100644
--- a/docs/death-deprecated.html
+++ b/docs/death-deprecated.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -329,9 +329,9 @@ <h2><span class="header-section-number">9.8</span> Death [Deprecated]</h2>
 <div id="css-6" class="section level3 unnumbered" number="">
 <h3>CSS</h3>
 <p>To hide the dashboard header insert the following css code to the <code>CSS</code> field on the edit page:</p>
-<div class="sourceCode" id="cb62"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb62-1"><a href="death-deprecated.html#cb62-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
-<span id="cb62-2"><a href="death-deprecated.html#cb62-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb62-3"><a href="death-deprecated.html#cb62-3" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb61"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb61-1"><a href="death-deprecated.html#cb61-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
+<span id="cb61-2"><a href="death-deprecated.html#cb61-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb61-3"><a href="death-deprecated.html#cb61-3" aria-hidden="true"></a>}</span></code></pre></div>
 <p>With this every time you want to edit the dashboard layout you have to either comment the CSS inserted
 or remove it so the “Edit Dashboard” button can show again.</p>
 </div>
@@ -384,12 +384,13 @@ <h3>Number of Records</h3>
 </div>
 <div id="sql-query-19" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb63"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb63-1"><a href="death-deprecated.html#cb63-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb63-2"><a href="death-deprecated.html#cb63-2" aria-hidden="true"></a>    count_value,</span>
-<span id="cb63-3"><a href="death-deprecated.html#cb63-3" aria-hidden="true"></a>    <span class="kw">source</span>.acronym</span>
-<span id="cb63-4"><a href="death-deprecated.html#cb63-4" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb63-5"><a href="death-deprecated.html#cb63-5" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb63-6"><a href="death-deprecated.html#cb63-6" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">501</span></span></code></pre></div>
+<div class="sourceCode" id="cb62"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb62-1"><a href="death-deprecated.html#cb62-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb62-2"><a href="death-deprecated.html#cb62-2" aria-hidden="true"></a>    count_value,</span>
+<span id="cb62-3"><a href="death-deprecated.html#cb62-3" aria-hidden="true"></a>    <span class="kw">source</span>.acronym</span>
+<span id="cb62-4"><a href="death-deprecated.html#cb62-4" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb62-5"><a href="death-deprecated.html#cb62-5" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb62-6"><a href="death-deprecated.html#cb62-6" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb62-7"><a href="death-deprecated.html#cb62-7" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">501</span></span></code></pre></div>
 </div>
 <div id="chart-settings-20" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -435,13 +436,14 @@ <h3>Death By Year per Thousand People</h3>
 </div>
 <div id="sql-query-20" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb64"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb64-1"><a href="death-deprecated.html#cb64-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb64-2"><a href="death-deprecated.html#cb64-2" aria-hidden="true"></a>    <span class="kw">source</span>.acronym,</span>
-<span id="cb64-3"><a href="death-deprecated.html#cb64-3" aria-hidden="true"></a>    <span class="fu">EXTRACT</span>(<span class="dt">year</span> <span class="kw">FROM</span> <span class="fu">TO_DATE</span>(stratum_1, <span class="st">&#39;YYYYMM&#39;</span>)) <span class="kw">AS</span> <span class="dt">Date</span>,</span>
-<span id="cb64-4"><a href="death-deprecated.html#cb64-4" aria-hidden="true"></a>    count_value</span>
-<span id="cb64-5"><a href="death-deprecated.html#cb64-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">as</span> achilles</span>
-<span id="cb64-6"><a href="death-deprecated.html#cb64-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">as</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb64-7"><a href="death-deprecated.html#cb64-7" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">502</span></span></code></pre></div>
+<div class="sourceCode" id="cb63"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb63-1"><a href="death-deprecated.html#cb63-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb63-2"><a href="death-deprecated.html#cb63-2" aria-hidden="true"></a>    <span class="kw">source</span>.acronym,</span>
+<span id="cb63-3"><a href="death-deprecated.html#cb63-3" aria-hidden="true"></a>    <span class="fu">EXTRACT</span>(<span class="dt">year</span> <span class="kw">FROM</span> <span class="fu">TO_DATE</span>(stratum_1, <span class="st">&#39;YYYYMM&#39;</span>)) <span class="kw">AS</span> <span class="dt">Date</span>,</span>
+<span id="cb63-4"><a href="death-deprecated.html#cb63-4" aria-hidden="true"></a>    count_value</span>
+<span id="cb63-5"><a href="death-deprecated.html#cb63-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">as</span> achilles</span>
+<span id="cb63-6"><a href="death-deprecated.html#cb63-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">as</span> <span class="kw">source</span></span>
+<span id="cb63-7"><a href="death-deprecated.html#cb63-7" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb63-8"><a href="death-deprecated.html#cb63-8" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">502</span></span></code></pre></div>
 </div>
 <div id="chart-settings-21" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
diff --git a/docs/development-instructions.html b/docs/development-instructions.html
index f3aeea00..6934d13e 100644
--- a/docs/development-instructions.html
+++ b/docs/development-instructions.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -350,47 +350,28 @@ <h3>Repository Structure Description</h3>
 </div>
 <div id="superset" class="section level3 unnumbered" number="">
 <h3>Superset</h3>
-<p>Currently, we have a custom chart plugin on our superset installation which doesn’t allow us to use superset’s pre-built images available on their docker hub, since we have to call npm’s build procedures on the front-end code.
-To build our custom docker image we used superset’s <a href="https://github.com/apache/superset/blob/1.0.1/Dockerfile">Dockerfile</a> as a base, where we removed the Dev section and added some code to install our chart plugins before building the front-end code.
-Also, to make Superset import our custom chart plugins, some changes have to be made to the <a href="https://github.com/apache/superset/blob/1.0.1/superset-frontend/src/visualizations/presets/MainPreset.js">superset-frontend/src/visualizations/presets/MainPreset.js</a> file.</p>
-<p>The changes made to the Dockerfile to install the chart plugins are in <a href="https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L44-L63">this</a> area:</p>
+<p>Currently, we have made some modifications to the box plot visualization on our superset installation which doesn’t allow us to use superset’s pre-built images available on their docker hub, since we have to call npm’s build procedures on the front-end code.
+To build our custom docker image we used superset’s <a href="https://github.com/apache/superset/blob/1.5.0/Dockerfile">Dockerfile</a> as a base, where we removed the Dev section and added some code to install our chart plugins before building the front-end code.</p>
+<p>The changes made to the Dockerfile to install the chart plugins are in <a href="https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L47-L49">this</a> area:</p>
 <ol style="list-style-type: decimal">
-<li>L44: First we copy the <code>superset/plugins</code> directory into the container, which contains all the extra and custom chart plugins.</li>
-<li>L48-51: Then we iterate over the chart plugins and execute <code>npm install ...</code> on each of them.
-This will make changes to both the package.json and package-lock.json files and for that, we copy them into a temporary directory <code>package_json_files</code>.</li>
-<li>L54: Then all superset’s front-end code is copied into the container, which will override the package*.json files.</li>
-<li>L56: After this, we copy our custom MainPresets.js file.</li>
-<li>L60-L63: Finally, we replace the package*.json files with the ones that we saved earlier and then run the npm build command.</li>
+<li>L46: Repalce some boxplot fiels with ours;</li>
+<li>L47: Superset’s original version of the controlPanel.ts file is a <code>.ts</code> versions however ours is a <code>.tsx</code>. For that, we have to remove the <code>.ts</code> version to properly override this file.</li>
 </ol>
 <div id="update-superset" class="section level4 unnumbered" number="">
 <h4>Update Superset</h4>
 <ol style="list-style-type: decimal">
 <li><p><code>cd</code> into superset’s submodule directory.</p></li>
-<li><p>Get the latest tags: <code>git fetch</code>.</p></li>
+<li><p>Get the latest tags: <code>git fetch -t</code>.</p></li>
 <li><p>Checkout to the new desired release tag.</p></li>
 <li><p>Check if there are any changes made to superset’s Dockerfile (on the root of the repository for the current latest release), adapt them, and insert them on our custom Dockerfile under the <code>docker/superset</code> directory.</p></li>
-<li><p>Check if there are any changes made to superset’s <code>superset-frontend/src/visualizations/presets/MainPreset.js</code> file.
-You can use the script <code>mainpreset_has_changes.py</code> under the <code>plugins</code> directory to check that.
-Apply the new changes, if any, and remember to keep our chart plugins imported and registered (Currently we only have the <em>Box plot</em> plugin).</p></li>
-<li><p>If the version of the frontend package <code>@superset-ui/plugin-chart-echarts</code> changed it’s necessary to update our box plot plugin.
-Follow the instructions present <a href="https://github.com/EHDEN/NetworkDashboards/tree/master/superset/plugins/plugins/plugin-chart-box-plot#how-to-update">here</a>, also take into account the instruction of the next section.</p></li>
+<li><p>If the version of the plugin package <code>plugin-chart-echarts</code> changed, it’s necessary to update our box plot plugin. If it is greater than 0.18.25, go to the history (<code>https://github.com/apache/superset/commits/[RELEASE-TAG]/superset-frontend/plugins/plugin-chart-echarts</code>) of commits done to the plugin-chart-echarts plugin update to the most recent commit, applying their changes to the files in the <code>superset/box-plot-overrides</code> directory. A fast way check the changes done between two commits: <code>git diff [old_commit_hash] [recent_commit_hash] -- superset-frontend/plugins/plugin-chart-echarts</code></p></li>
 </ol>
 </div>
 <div id="chart-plugin-development" class="section level4 unnumbered" number="">
 <h4>Chart Plugin Development</h4>
-<p>Instructions on how you can set up your development environment to develop on a custom superset chart plugin:</p>
 <ol style="list-style-type: decimal">
-<li><p>Clone the <a href="https://github.com/apache/superset">superset</a> repository.
-<strong>IMPORTANT NOTE</strong>: Since we build the superset’s docker image using the existing superset’s submodule, it’s better not to use it to develop the plugins.
-If you decide to use it anyways, remember <a href="https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L54">this</a> and <a href="https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L99">this</a> steps.
-They might override directories (<code>superset-frontend/node_modules</code> and <code>superset/static/assets</code>) that are generated during the build process, which can cause frontend compilation errors or the app can serve outdated static files.</p></li>
-<li><p>Clone the <a href="https://github.com/apache-superset/superset-ui">superset-ui</a> repository into the directory superset-frontend of superset’s repository.</p></li>
-<li><p>Follow the instructions of <a href="https://superset.apache.org/docs/installation/building-custom-viz-plugins">this tutorial</a> to create the necessary base files of your plugin.</p></li>
-<li><p>Copy the file <code>MainPreset.js</code> present on this directory into the superset repository into the <code>superset-frontend/src/visualizations/presets/</code> directory.</p></li>
-<li><p>Add the line <code>npm install -f --no-optional --save ./superset-frontend/superset-ui/plugins/plugin-chart-[your-chart-name]</code> into the file <code>docker/docker-frontend.sh</code> of the superset repository before the existing <code>npm install ...</code> commands.</p></li>
-<li><p>When the development is finished, on the root of the superset-ui repository run <code>yarn install</code> and then <code>yarn build [your-chart-name]</code>.</p></li>
-<li><p>Copy the directory of your plugin (including its sub-directory <code>esm</code>), within the superset-ui repository within the directory <code>plugins</code>, into the sub-directory <code>plugins</code> this directory.
-Make sure to run the command <code>yarn build [your-chart-name]</code> before doing this step.</p></li>
+<li><p>Follow the instructions of <a href="https://superset.apache.org/docs/contributing/creating-viz-plugins">this tutorial</a> to create the necessary base files of your plugin.</p></li>
+<li><p>To deploy you can either use the <code>DYNAMIC_PLUGINS</code> feature flag or you can add and build your plugins in <code>superset/Dockerfile</code>.</p></li>
 </ol>
 </div>
 <div id="important-features" class="section level4 unnumbered" number="">
diff --git a/docs/development.md b/docs/development.md
index df5ecc67..7aca10fd 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -33,57 +33,31 @@
 
 ### Superset {-}
 
-Currently, we have a custom chart plugin on our superset installation which doesn't allow us to use superset's pre-built images available on their docker hub, since we have to call npm's build procedures on the front-end code.
-To build our custom docker image we used superset's [Dockerfile](https://github.com/apache/superset/blob/1.0.1/Dockerfile) as a base, where we removed the Dev section and added some code to install our chart plugins before building the front-end code.
-Also, to make Superset import our custom chart plugins, some changes have to be made to the [superset-frontend/src/visualizations/presets/MainPreset.js](https://github.com/apache/superset/blob/1.0.1/superset-frontend/src/visualizations/presets/MainPreset.js) file.
+Currently, we have made some modifications to the box plot visualization on our superset installation which doesn't allow us to use superset's pre-built images available on their docker hub, since we have to call npm's build procedures on the front-end code.
+To build our custom docker image we used superset's [Dockerfile](https://github.com/apache/superset/blob/1.5.0/Dockerfile) as a base, where we removed the Dev section and added some code to install our chart plugins before building the front-end code.
 
-The changes made to the Dockerfile to install the chart plugins are in [this](https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L44-L63) area:
+The changes made to the Dockerfile to install the chart plugins are in [this](https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L47-L49) area:
 
-1. L44: First we copy the `superset/plugins` directory into the container, which contains all the extra and custom chart plugins.
-2. L48-51: Then we iterate over the chart plugins and execute `npm install ...` on each of them.
-   This will make changes to both the package.json and package-lock.json files and for that, we copy them into a temporary directory `package_json_files`.
-3. L54: Then all superset's front-end code is copied into the container, which will override the package*.json files.
-4. L56: After this, we copy our custom MainPresets.js file.
-5. L60-L63: Finally, we replace the package*.json files with the ones that we saved earlier and then run the npm build command.
+1. L46: Repalce some boxplot fiels with ours;
+2. L47: Superset's original version of the controlPanel.ts file is a `.ts` versions however ours is a `.tsx`. For that, we have to remove the `.ts` version to properly override this file.
 
 #### Update Superset {-}
 
 1. `cd` into superset's submodule directory.
 
-2. Get the latest tags: `git fetch`.
+2. Get the latest tags: `git fetch -t`.
 
 3. Checkout to the new desired release tag.
 
 4. Check if there are any changes made to superset's Dockerfile (on the root of the repository for the current latest release), adapt them, and insert them on our custom Dockerfile under the `docker/superset` directory.
 
-5. Check if there are any changes made to superset's `superset-frontend/src/visualizations/presets/MainPreset.js` file.
-   You can use the script `mainpreset_has_changes.py` under the `plugins` directory to check that.
-   Apply the new changes, if any, and remember to keep our chart plugins imported and registered (Currently we only have the *Box plot* plugin).
-
-6. If the version of the frontend package `@superset-ui/plugin-chart-echarts` changed it's necessary to update our box plot plugin.
-   Follow the instructions present [here](https://github.com/EHDEN/NetworkDashboards/tree/master/superset/plugins/plugins/plugin-chart-box-plot#how-to-update), also take into account the instruction of the next section.
+6. If the version of the plugin package `plugin-chart-echarts` changed, it's necessary to update our box plot plugin. If it is greater than 0.18.25, go to the history (`https://github.com/apache/superset/commits/[RELEASE-TAG]/superset-frontend/plugins/plugin-chart-echarts`) of commits done to the plugin-chart-echarts plugin update to the most recent commit, applying their changes to the files in the `superset/box-plot-overrides` directory. A fast way check the changes done between two commits: `git diff [old_commit_hash] [recent_commit_hash] -- superset-frontend/plugins/plugin-chart-echarts`
 
 #### Chart Plugin Development {-}
 
-Instructions on how you can set up your development environment to develop on a custom superset chart plugin:
-
-1. Clone the [superset](https://github.com/apache/superset) repository.
-   **IMPORTANT NOTE**: Since we build the superset's docker image using the existing superset's submodule, it's better not to use it to develop the plugins.
-   If you decide to use it anyways, remember [this](https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L54) and [this](https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L99) steps.
-   They might override directories (`superset-frontend/node_modules` and `superset/static/assets`) that are generated during the build process, which can cause frontend compilation errors or the app can serve outdated static files.
-
-2. Clone the [superset-ui](https://github.com/apache-superset/superset-ui) repository into the directory superset-frontend of superset's repository.
-
-1. Follow the instructions of [this tutorial](https://superset.apache.org/docs/installation/building-custom-viz-plugins) to create the necessary base files of your plugin.
+1. Follow the instructions of [this tutorial](https://superset.apache.org/docs/contributing/creating-viz-plugins) to create the necessary base files of your plugin.
 
-2. Copy the file `MainPreset.js` present on this directory into the superset repository into the `superset-frontend/src/visualizations/presets/` directory.
-
-3. Add the line `npm install -f --no-optional --save ./superset-frontend/superset-ui/plugins/plugin-chart-[your-chart-name]` into the file `docker/docker-frontend.sh` of the superset repository before the existing `npm install ...` commands.
-
-4. When the development is finished, on the root of the superset-ui repository run `yarn install` and then `yarn build [your-chart-name]`.
-
-5. Copy the directory of your plugin (including its sub-directory `esm`), within the superset-ui repository within the directory `plugins`, into the sub-directory `plugins` this directory.
-   Make sure to run the command `yarn build [your-chart-name]` before doing this step.
+2. To deploy you can either use the `DYNAMIC_PLUGINS` feature flag or you can add and build your plugins in `superset/Dockerfile`.
 
 #### Important features {-}
 
@@ -93,6 +67,7 @@ Instructions on how you can set up your development environment to develop on a
 2. Filters:
   - check [this](https://superset.apache.org/docs/frequently-asked-questions#how-to-add-dynamic-filters-to-a-dashboard) faq entry
   - Append `?preselect_filters={"chartId":{"columnToFilterBy":["value1", "value2"]}}` to the dashboard URL to apply a filter once the dashboard is loaded. E.g. `?preselect_filters={"13":{"name":["Demo University of Aveiro"]}}`
+
 3. Custom label colors: check [this](https://superset.apache.org/docs/frequently-asked-questions#is-there-a-way-to-force-the-use-specific-colors) faq entry
 
 ### Github Actions {-}
diff --git a/docs/general-deprecated.html b/docs/general-deprecated.html
index e5124b03..d401b242 100644
--- a/docs/general-deprecated.html
+++ b/docs/general-deprecated.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -329,9 +329,9 @@ <h2><span class="header-section-number">9.4</span> General [Deprecated]</h2>
 <div id="css-2" class="section level3 unnumbered" number="">
 <h3>CSS</h3>
 <p>To hide the dashboard header insert the following css code to the <code>CSS</code> field on the edit page:</p>
-<div class="sourceCode" id="cb42"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb42-1"><a href="general-deprecated.html#cb42-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
-<span id="cb42-2"><a href="general-deprecated.html#cb42-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb42-3"><a href="general-deprecated.html#cb42-3" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb41"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb41-1"><a href="general-deprecated.html#cb41-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
+<span id="cb41-2"><a href="general-deprecated.html#cb41-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb41-3"><a href="general-deprecated.html#cb41-3" aria-hidden="true"></a>}</span></code></pre></div>
 <p>With this every time you want to edit the dashboard layout you have to either comment the CSS inserted
 or remove it so the “Edit Dashboard” button can show again.</p>
 </div>
@@ -347,12 +347,13 @@ <h3>Database Type and Country Filter</h3>
 <p><strong>For the filters to work the name of the fields to filter should match in all tables used on the charts of this dashboard.</strong></p>
 <div id="sql-query" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb43"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb43-1"><a href="general-deprecated.html#cb43-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb43-2"><a href="general-deprecated.html#cb43-2" aria-hidden="true"></a>       country.country,</span>
-<span id="cb43-3"><a href="general-deprecated.html#cb43-3" aria-hidden="true"></a>       <span class="kw">source</span>.database_type,</span>
-<span id="cb43-4"><a href="general-deprecated.html#cb43-4" aria-hidden="true"></a>       <span class="kw">source</span>.acronym</span>
-<span id="cb43-5"><a href="general-deprecated.html#cb43-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
-<span id="cb43-6"><a href="general-deprecated.html#cb43-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.country <span class="kw">AS</span> country <span class="kw">ON</span> <span class="kw">source</span>.country_id<span class="op">=</span>country.<span class="kw">id</span></span></code></pre></div>
+<div class="sourceCode" id="cb42"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb42-1"><a href="general-deprecated.html#cb42-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb42-2"><a href="general-deprecated.html#cb42-2" aria-hidden="true"></a>       country.country,</span>
+<span id="cb42-3"><a href="general-deprecated.html#cb42-3" aria-hidden="true"></a>       <span class="kw">source</span>.database_type,</span>
+<span id="cb42-4"><a href="general-deprecated.html#cb42-4" aria-hidden="true"></a>       <span class="kw">source</span>.acronym</span>
+<span id="cb42-5"><a href="general-deprecated.html#cb42-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb42-6"><a href="general-deprecated.html#cb42-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.country <span class="kw">AS</span> country</span>
+<span id="cb42-7"><a href="general-deprecated.html#cb42-7" aria-hidden="true"></a>  <span class="kw">ON</span> <span class="kw">source</span>.country_id<span class="op">=</span>country.<span class="kw">id</span></span></code></pre></div>
 </div>
 <div id="chart-settings" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -390,15 +391,15 @@ <h3>Total Number of Patients</h3>
 </div>
 <div id="sql-query-1" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb44"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb44-1"><a href="general-deprecated.html#cb44-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
-<span id="cb44-2"><a href="general-deprecated.html#cb44-2" aria-hidden="true"></a> country,</span>
-<span id="cb44-3"><a href="general-deprecated.html#cb44-3" aria-hidden="true"></a> database_type,</span>
-<span id="cb44-4"><a href="general-deprecated.html#cb44-4" aria-hidden="true"></a> release_date,</span>
-<span id="cb44-5"><a href="general-deprecated.html#cb44-5" aria-hidden="true"></a> <span class="fu">SUM</span>(count_value) <span class="kw">OVER</span> (<span class="kw">ORDER</span> <span class="kw">BY</span> release_date <span class="kw">ASC</span>)</span>
-<span id="cb44-6"><a href="general-deprecated.html#cb44-6" aria-hidden="true"></a><span class="kw">FROM</span> achilles_results</span>
-<span id="cb44-7"><a href="general-deprecated.html#cb44-7" aria-hidden="true"></a><span class="kw">JOIN</span> data_source <span class="kw">ON</span> data_source_id <span class="op">=</span> data_source.<span class="kw">id</span></span>
-<span id="cb44-8"><a href="general-deprecated.html#cb44-8" aria-hidden="true"></a><span class="kw">JOIN</span> country <span class="kw">ON</span> data_source.country_id <span class="op">=</span> country.<span class="kw">id</span></span>
-<span id="cb44-9"><a href="general-deprecated.html#cb44-9" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">1</span></span></code></pre></div>
+<div class="sourceCode" id="cb43"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb43-1"><a href="general-deprecated.html#cb43-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
+<span id="cb43-2"><a href="general-deprecated.html#cb43-2" aria-hidden="true"></a> country,</span>
+<span id="cb43-3"><a href="general-deprecated.html#cb43-3" aria-hidden="true"></a> database_type,</span>
+<span id="cb43-4"><a href="general-deprecated.html#cb43-4" aria-hidden="true"></a> release_date,</span>
+<span id="cb43-5"><a href="general-deprecated.html#cb43-5" aria-hidden="true"></a> <span class="fu">SUM</span>(count_value) <span class="kw">OVER</span> (<span class="kw">ORDER</span> <span class="kw">BY</span> release_date <span class="kw">ASC</span>)</span>
+<span id="cb43-6"><a href="general-deprecated.html#cb43-6" aria-hidden="true"></a><span class="kw">FROM</span> achilles_results</span>
+<span id="cb43-7"><a href="general-deprecated.html#cb43-7" aria-hidden="true"></a><span class="kw">JOIN</span> data_source <span class="kw">ON</span> data_source_id <span class="op">=</span> data_source.<span class="kw">id</span></span>
+<span id="cb43-8"><a href="general-deprecated.html#cb43-8" aria-hidden="true"></a><span class="kw">JOIN</span> country <span class="kw">ON</span> data_source.country_id <span class="op">=</span> country.<span class="kw">id</span></span>
+<span id="cb43-9"><a href="general-deprecated.html#cb43-9" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">1</span></span></code></pre></div>
 </div>
 <div id="chart-settings-1" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -441,21 +442,23 @@ <h3>Network Growth by Date</h3>
 </div>
 <div id="sql-query-2" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb45"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb45-1"><a href="general-deprecated.html#cb45-1" aria-hidden="true"></a><span class="kw">SELECT</span>  <span class="kw">source</span>.name <span class="kw">AS</span> <span class="kw">source</span>,</span>
-<span id="cb45-2"><a href="general-deprecated.html#cb45-2" aria-hidden="true"></a>        country.country,</span>
-<span id="cb45-3"><a href="general-deprecated.html#cb45-3" aria-hidden="true"></a>        <span class="kw">source</span>.database_type,</span>
-<span id="cb45-4"><a href="general-deprecated.html#cb45-4" aria-hidden="true"></a>        <span class="kw">source</span>.release_date,</span>
-<span id="cb45-5"><a href="general-deprecated.html#cb45-5" aria-hidden="true"></a>        concepts.concept_name <span class="kw">AS</span> gender,</span>
-<span id="cb45-6"><a href="general-deprecated.html#cb45-6" aria-hidden="true"></a>        achilles.count_value <span class="kw">as</span> <span class="fu">count</span></span>
-<span id="cb45-7"><a href="general-deprecated.html#cb45-7" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb45-8"><a href="general-deprecated.html#cb45-8" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb45-9"><a href="general-deprecated.html#cb45-9" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.country <span class="kw">AS</span> country <span class="kw">ON</span> <span class="kw">source</span>.country_id<span class="op">=</span>country.<span class="kw">id</span></span>
-<span id="cb45-10"><a href="general-deprecated.html#cb45-10" aria-hidden="true"></a><span class="kw">JOIN</span> (</span>
-<span id="cb45-11"><a href="general-deprecated.html#cb45-11" aria-hidden="true"></a>  <span class="kw">SELECT</span> <span class="st">&#39;8507&#39;</span> <span class="kw">AS</span> concept_id, <span class="st">&#39;Male&#39;</span> <span class="kw">AS</span> concept_name</span>
-<span id="cb45-12"><a href="general-deprecated.html#cb45-12" aria-hidden="true"></a>  <span class="kw">UNION</span></span>
-<span id="cb45-13"><a href="general-deprecated.html#cb45-13" aria-hidden="true"></a>  <span class="kw">SELECT</span> <span class="st">&#39;8532&#39;</span>, <span class="st">&#39;Female&#39;</span></span>
-<span id="cb45-14"><a href="general-deprecated.html#cb45-14" aria-hidden="true"></a>) <span class="kw">AS</span> concepts <span class="kw">ON</span> achilles.stratum_1 <span class="op">=</span> concept_id</span>
-<span id="cb45-15"><a href="general-deprecated.html#cb45-15" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">2</span></span></code></pre></div>
+<div class="sourceCode" id="cb44"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb44-1"><a href="general-deprecated.html#cb44-1" aria-hidden="true"></a><span class="kw">SELECT</span>  <span class="kw">source</span>.name <span class="kw">AS</span> <span class="kw">source</span>,</span>
+<span id="cb44-2"><a href="general-deprecated.html#cb44-2" aria-hidden="true"></a>        country.country,</span>
+<span id="cb44-3"><a href="general-deprecated.html#cb44-3" aria-hidden="true"></a>        <span class="kw">source</span>.database_type,</span>
+<span id="cb44-4"><a href="general-deprecated.html#cb44-4" aria-hidden="true"></a>        <span class="kw">source</span>.release_date,</span>
+<span id="cb44-5"><a href="general-deprecated.html#cb44-5" aria-hidden="true"></a>        concepts.concept_name <span class="kw">AS</span> gender,</span>
+<span id="cb44-6"><a href="general-deprecated.html#cb44-6" aria-hidden="true"></a>        achilles.count_value <span class="kw">as</span> <span class="fu">count</span></span>
+<span id="cb44-7"><a href="general-deprecated.html#cb44-7" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb44-8"><a href="general-deprecated.html#cb44-8" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb44-9"><a href="general-deprecated.html#cb44-9" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb44-10"><a href="general-deprecated.html#cb44-10" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.country <span class="kw">AS</span> country</span>
+<span id="cb44-11"><a href="general-deprecated.html#cb44-11" aria-hidden="true"></a>  <span class="kw">ON</span> <span class="kw">source</span>.country_id<span class="op">=</span>country.<span class="kw">id</span></span>
+<span id="cb44-12"><a href="general-deprecated.html#cb44-12" aria-hidden="true"></a><span class="kw">JOIN</span> (</span>
+<span id="cb44-13"><a href="general-deprecated.html#cb44-13" aria-hidden="true"></a>  <span class="kw">SELECT</span> <span class="st">&#39;8507&#39;</span> <span class="kw">AS</span> concept_id, <span class="st">&#39;Male&#39;</span> <span class="kw">AS</span> concept_name</span>
+<span id="cb44-14"><a href="general-deprecated.html#cb44-14" aria-hidden="true"></a>  <span class="kw">UNION</span></span>
+<span id="cb44-15"><a href="general-deprecated.html#cb44-15" aria-hidden="true"></a>  <span class="kw">SELECT</span> <span class="st">&#39;8532&#39;</span>, <span class="st">&#39;Female&#39;</span></span>
+<span id="cb44-16"><a href="general-deprecated.html#cb44-16" aria-hidden="true"></a>) <span class="kw">AS</span> concepts <span class="kw">ON</span> achilles.stratum_1 <span class="op">=</span> concept_id</span>
+<span id="cb44-17"><a href="general-deprecated.html#cb44-17" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">2</span></span></code></pre></div>
 </div>
 <div id="chart-settings-2" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -501,15 +504,17 @@ <h3>Patients per Country</h3>
 Figure 9.4: Settings for creating the Patients per Country chart
 </p>
 </div>
-<div id="sql-query-patientspercountryquery" class="section level4 unnumbered" number="">
-<h4>SQL query {#patientsPerCountryQuery}</h4>
-<div class="sourceCode" id="cb46"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb46-1"><a href="general-deprecated.html#cb46-1" aria-hidden="true"></a><span class="kw">SELECT</span> country.country,</span>
-<span id="cb46-2"><a href="general-deprecated.html#cb46-2" aria-hidden="true"></a>       <span class="kw">source</span>.database_type,</span>
-<span id="cb46-3"><a href="general-deprecated.html#cb46-3" aria-hidden="true"></a>       count_value</span>
-<span id="cb46-4"><a href="general-deprecated.html#cb46-4" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles </span>
-<span id="cb46-5"><a href="general-deprecated.html#cb46-5" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb46-6"><a href="general-deprecated.html#cb46-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.country <span class="kw">AS</span> country <span class="kw">ON</span> <span class="kw">source</span>.country_id<span class="op">=</span>country.<span class="kw">id</span></span>
-<span id="cb46-7"><a href="general-deprecated.html#cb46-7" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">1</span></span></code></pre></div>
+<div id="patientsPerCountryQuery" class="section level4 unnumbered" number="">
+<h4>SQL query</h4>
+<div class="sourceCode" id="cb45"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb45-1"><a href="general-deprecated.html#cb45-1" aria-hidden="true"></a><span class="kw">SELECT</span> country.country,</span>
+<span id="cb45-2"><a href="general-deprecated.html#cb45-2" aria-hidden="true"></a>       <span class="kw">source</span>.database_type,</span>
+<span id="cb45-3"><a href="general-deprecated.html#cb45-3" aria-hidden="true"></a>       count_value</span>
+<span id="cb45-4"><a href="general-deprecated.html#cb45-4" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb45-5"><a href="general-deprecated.html#cb45-5" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb45-6"><a href="general-deprecated.html#cb45-6" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb45-7"><a href="general-deprecated.html#cb45-7" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.country <span class="kw">AS</span> country</span>
+<span id="cb45-8"><a href="general-deprecated.html#cb45-8" aria-hidden="true"></a>  <span class="kw">ON</span> <span class="kw">source</span>.country_id<span class="op">=</span>country.<span class="kw">id</span></span>
+<span id="cb45-9"><a href="general-deprecated.html#cb45-9" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">1</span></span></code></pre></div>
 </div>
 <div id="chart-settings-3" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -555,7 +560,7 @@ <h3>Database Types per Country</h3>
 </div>
 <div id="sql-query-3" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<p>Same as <a href="#patientsPerCountryQuery">Patients per Country</a> query</p>
+<p>Same as <a href="general-deprecated.html#patientsPerCountryQuery">Patients per Country</a> query</p>
 </div>
 <div id="chart-settings-4" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -596,14 +601,15 @@ <h3>World Map</h3>
 <!-- Discuss what is important to see in this chart... TO DO -->
 <div id="sql-query-4" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb47"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb47-1"><a href="general-deprecated.html#cb47-1" aria-hidden="true"></a><span class="kw">SELECT</span>  name,</span>
-<span id="cb47-2"><a href="general-deprecated.html#cb47-2" aria-hidden="true"></a>        acronym,</span>
-<span id="cb47-3"><a href="general-deprecated.html#cb47-3" aria-hidden="true"></a>        database_type,</span>
-<span id="cb47-4"><a href="general-deprecated.html#cb47-4" aria-hidden="true"></a>        latitude,</span>
-<span id="cb47-5"><a href="general-deprecated.html#cb47-5" aria-hidden="true"></a>        longitude,</span>
-<span id="cb47-6"><a href="general-deprecated.html#cb47-6" aria-hidden="true"></a>        country</span>
-<span id="cb47-7"><a href="general-deprecated.html#cb47-7" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
-<span id="cb47-8"><a href="general-deprecated.html#cb47-8" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.country <span class="kw">AS</span> country <span class="kw">ON</span> <span class="kw">source</span>.country_id<span class="op">=</span>country.<span class="kw">id</span></span></code></pre></div>
+<div class="sourceCode" id="cb46"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb46-1"><a href="general-deprecated.html#cb46-1" aria-hidden="true"></a><span class="kw">SELECT</span>  name,</span>
+<span id="cb46-2"><a href="general-deprecated.html#cb46-2" aria-hidden="true"></a>        acronym,</span>
+<span id="cb46-3"><a href="general-deprecated.html#cb46-3" aria-hidden="true"></a>        database_type,</span>
+<span id="cb46-4"><a href="general-deprecated.html#cb46-4" aria-hidden="true"></a>        latitude,</span>
+<span id="cb46-5"><a href="general-deprecated.html#cb46-5" aria-hidden="true"></a>        longitude,</span>
+<span id="cb46-6"><a href="general-deprecated.html#cb46-6" aria-hidden="true"></a>        country</span>
+<span id="cb46-7"><a href="general-deprecated.html#cb46-7" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb46-8"><a href="general-deprecated.html#cb46-8" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.country <span class="kw">AS</span> country</span>
+<span id="cb46-9"><a href="general-deprecated.html#cb46-9" aria-hidden="true"></a>  <span class="kw">ON</span> <span class="kw">source</span>.country_id<span class="op">=</span>country.<span class="kw">id</span></span></code></pre></div>
 </div>
 <div id="chart-settings-5" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -641,19 +647,20 @@ <h3>Meta Data</h3>
 </div>
 <div id="sql-query-5" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb48"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb48-1"><a href="general-deprecated.html#cb48-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
-<span id="cb48-2"><a href="general-deprecated.html#cb48-2" aria-hidden="true"></a>  acronym,</span>
-<span id="cb48-3"><a href="general-deprecated.html#cb48-3" aria-hidden="true"></a>  stratum_1 <span class="kw">as</span> <span class="ot">&quot;name&quot;</span>,</span>
-<span id="cb48-4"><a href="general-deprecated.html#cb48-4" aria-hidden="true"></a>  database_type,</span>
-<span id="cb48-5"><a href="general-deprecated.html#cb48-5" aria-hidden="true"></a>  country,</span>
-<span id="cb48-6"><a href="general-deprecated.html#cb48-6" aria-hidden="true"></a>  stratum_2 <span class="kw">as</span> <span class="ot">&quot;source_release_date&quot;</span>,</span>
-<span id="cb48-7"><a href="general-deprecated.html#cb48-7" aria-hidden="true"></a>  stratum_3 <span class="kw">as</span> <span class="ot">&quot;cdm_release_date&quot;</span>,</span>
-<span id="cb48-8"><a href="general-deprecated.html#cb48-8" aria-hidden="true"></a>  stratum_4 <span class="kw">as</span> <span class="ot">&quot;cdm_version&quot;</span>,</span>
-<span id="cb48-9"><a href="general-deprecated.html#cb48-9" aria-hidden="true"></a>  stratum_5 <span class="kw">as</span> <span class="ot">&quot;vocabulary_version&quot;</span></span>
-<span id="cb48-10"><a href="general-deprecated.html#cb48-10" aria-hidden="true"></a><span class="kw">FROM</span> achilles_results</span>
-<span id="cb48-11"><a href="general-deprecated.html#cb48-11" aria-hidden="true"></a><span class="kw">JOIN</span> data_source <span class="kw">ON</span> achilles_results.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span></span>
-<span id="cb48-12"><a href="general-deprecated.html#cb48-12" aria-hidden="true"></a><span class="kw">JOIN</span> country <span class="kw">ON</span> data_source.country_id <span class="op">=</span> country.<span class="kw">id</span></span>
-<span id="cb48-13"><a href="general-deprecated.html#cb48-13" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id<span class="op">=</span><span class="dv">5000</span></span></code></pre></div>
+<div class="sourceCode" id="cb47"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb47-1"><a href="general-deprecated.html#cb47-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
+<span id="cb47-2"><a href="general-deprecated.html#cb47-2" aria-hidden="true"></a>  acronym,</span>
+<span id="cb47-3"><a href="general-deprecated.html#cb47-3" aria-hidden="true"></a>  stratum_1 <span class="kw">as</span> <span class="ot">&quot;name&quot;</span>,</span>
+<span id="cb47-4"><a href="general-deprecated.html#cb47-4" aria-hidden="true"></a>  database_type,</span>
+<span id="cb47-5"><a href="general-deprecated.html#cb47-5" aria-hidden="true"></a>  country,</span>
+<span id="cb47-6"><a href="general-deprecated.html#cb47-6" aria-hidden="true"></a>  stratum_2 <span class="kw">as</span> <span class="ot">&quot;source_release_date&quot;</span>,</span>
+<span id="cb47-7"><a href="general-deprecated.html#cb47-7" aria-hidden="true"></a>  stratum_3 <span class="kw">as</span> <span class="ot">&quot;cdm_release_date&quot;</span>,</span>
+<span id="cb47-8"><a href="general-deprecated.html#cb47-8" aria-hidden="true"></a>  stratum_4 <span class="kw">as</span> <span class="ot">&quot;cdm_version&quot;</span>,</span>
+<span id="cb47-9"><a href="general-deprecated.html#cb47-9" aria-hidden="true"></a>  stratum_5 <span class="kw">as</span> <span class="ot">&quot;vocabulary_version&quot;</span></span>
+<span id="cb47-10"><a href="general-deprecated.html#cb47-10" aria-hidden="true"></a><span class="kw">FROM</span> achilles_results</span>
+<span id="cb47-11"><a href="general-deprecated.html#cb47-11" aria-hidden="true"></a><span class="kw">JOIN</span> data_source</span>
+<span id="cb47-12"><a href="general-deprecated.html#cb47-12" aria-hidden="true"></a>  <span class="kw">ON</span> achilles_results.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span></span>
+<span id="cb47-13"><a href="general-deprecated.html#cb47-13" aria-hidden="true"></a><span class="kw">JOIN</span> country <span class="kw">ON</span> data_source.country_id <span class="op">=</span> country.<span class="kw">id</span></span>
+<span id="cb47-14"><a href="general-deprecated.html#cb47-14" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id<span class="op">=</span><span class="dv">5000</span></span></code></pre></div>
 </div>
 <div id="chart-settings-6" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
diff --git a/docs/index.html b/docs/index.html
index 31e2bb97..60da8a20 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -326,7 +326,7 @@ <h1>
 <div id="header">
 <h1 class="title">Data Network Dashboards</h1>
 <p class="author"><em>This document is currently under construction</em></p>
-<p class="date"><em>2022-01-04</em></p>
+<p class="date"><em>2022-06-18</em></p>
 </div>
 <div id="preface" class="section level1" number="1">
 <h1><span class="header-section-number">Chapter 1</span> Preface</h1>
diff --git a/docs/index.md b/docs/index.md
index e246332d..e7de2016 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,7 +1,7 @@
 --- 
 title: "Data Network Dashboards"
 author: "This document is currently under construction"
-date: "2022-01-04"
+date: "2022-06-18"
 site: bookdown::bookdown_site
 output: bookdown::gitbook
 documentclass: book
diff --git a/docs/installation.html b/docs/installation.html
index 09543f57..d2930fab 100644
--- a/docs/installation.html
+++ b/docs/installation.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -330,8 +330,8 @@ <h1><span class="header-section-number">Chapter 3</span> Installation</h1>
 <h3>First Steps</h3>
 <ol style="list-style-type: decimal">
 <li><p>Clone the repository with the command <code>git clone --recurse-submodules https://github.com/EHDEN/NetworkDashboards</code>. If you already cloned the repository without the <code>--recurse-submodules</code> option, run <code>git submodule update --init</code> to fetch the superset submodule.</p></li>
-<li><p>Create a <code>.env</code> file on the <code>docker</code> directory, using <code>.env-example</code> as a reference, setting all necessary environment variables (<code>SUPERSET\_MAPBOX\_API\_KEY</code> and <code>DASHBOARD\_VIEWER\_SECRET\_KEY</code>).</p>
-<p>2.1 If you will use this application as a third-party application and will iframe it, set the variable <code>SINGLE\_APPLICATION\_MODE</code> to <code>False</code> and define the host of the main application on the variable <code>MAIN\_APPLICATION\_HOST</code>. Also make sure to add this last host to the list of <code>ALLOWED\_HOSTS</code>.</p></li>
+<li><p>Create a <code>.env</code> file on the <code>docker</code> directory, using <code>.env-example</code> as a reference, setting all necessary environment variables (<code>SUPERSET_MAPBOX_API_KEY</code> and <code>DASHBOARD_VIEWER_SECRET_KEY</code>).</p>
+<p>2.1 If you will use this application as a third-party application and will iframe it, set the variable <code>SINGLE_APPLICATION_MODE</code> to <code>False</code> and define the host of the main application on the variable <code>MAIN_APPLICATION_HOST</code>. Also make sure to add this last host to the list of <code>ALLOWED_HOSTS</code>.</p></li>
 </ol>
 </div>
 <div id="dashboard-viewer-setup" class="section level3 unnumbered" number="">
@@ -391,7 +391,7 @@ <h3>Superset setup</h3>
 </ul></li>
 <li><p>By default Superset’s admin user credentials are admin/admin.
 It is recommended that you change the password if you will use this in a production environment.</p></li>
-<li><p>To any anonymous user view dashboards, add the following:</p>
+<li><p>To any anonymous user view dashboards, add the following permissions to the public role:</p>
 <ul>
 <li>all datasource access on all_datasource_access</li>
 <li>can csrf token on Superset</li>
@@ -401,6 +401,7 @@ <h3>Superset setup</h3>
 <li>can read on CssTemplate</li>
 <li>can read on Dashboard</li>
 </ul></li>
+<li><p>For each dashboard you want anonymous users to be able to access, on the dashboard list page click edit (the pencil on the right) and add the “Admin” and “Public” roles to the “Roles with acess” field.</p></li>
 </ol>
 </div>
 <div id="dummy-data" class="section level3 unnumbered" number="">
diff --git a/docs/introduction.html b/docs/introduction.html
index 85e67bb4..298e708b 100644
--- a/docs/introduction.html
+++ b/docs/introduction.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
diff --git a/docs/materialized-views-1.html b/docs/materialized-views-1.html
index fe426151..7e9eaa86 100644
--- a/docs/materialized-views-1.html
+++ b/docs/materialized-views-1.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -327,777 +327,1252 @@ <h1>
 <h2><span class="header-section-number">9.3</span> Materialized views</h2>
 <div id="meta_data_table" class="section level3 unnumbered" number="">
 <h3>meta_data_table</h3>
-<div class="sourceCode" id="cb17"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb17-1"><a href="materialized-views-1.html#cb17-1" aria-hidden="true"></a><span class="kw">SELECT</span> data_source.acronym,</span>
-<span id="cb17-2"><a href="materialized-views-1.html#cb17-2" aria-hidden="true"></a>   data_source.name,</span>
-<span id="cb17-3"><a href="materialized-views-1.html#cb17-3" aria-hidden="true"></a>   data_source.database_type,</span>
-<span id="cb17-4"><a href="materialized-views-1.html#cb17-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb17-5"><a href="materialized-views-1.html#cb17-5" aria-hidden="true"></a>   p.count_value <span class="kw">AS</span> number_of_patients,</span>
-<span id="cb17-6"><a href="materialized-views-1.html#cb17-6" aria-hidden="true"></a>   a.stratum_2 <span class="kw">AS</span> source_release_date,</span>
-<span id="cb17-7"><a href="materialized-views-1.html#cb17-7" aria-hidden="true"></a>   a.stratum_3 <span class="kw">AS</span> cdm_release_date,</span>
-<span id="cb17-8"><a href="materialized-views-1.html#cb17-8" aria-hidden="true"></a>   a.stratum_4 <span class="kw">AS</span> cdm_version,</span>
-<span id="cb17-9"><a href="materialized-views-1.html#cb17-9" aria-hidden="true"></a>   a.stratum_5 <span class="kw">AS</span> vocabulary_version,</span>
-<span id="cb17-10"><a href="materialized-views-1.html#cb17-10" aria-hidden="true"></a>   p.stratum_3 <span class="kw">AS</span> execution_date,</span>
-<span id="cb17-11"><a href="materialized-views-1.html#cb17-11" aria-hidden="true"></a>   p.stratum_2 <span class="kw">AS</span> package_version</span>
-<span id="cb17-12"><a href="materialized-views-1.html#cb17-12" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results a</span>
-<span id="cb17-13"><a href="materialized-views-1.html#cb17-13" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">ON</span> ((a.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)))</span>
-<span id="cb17-14"><a href="materialized-views-1.html#cb17-14" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((data_source.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
-<span id="cb17-15"><a href="materialized-views-1.html#cb17-15" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.count_value,</span>
-<span id="cb17-16"><a href="materialized-views-1.html#cb17-16" aria-hidden="true"></a>           achilles_results.data_source_id,</span>
-<span id="cb17-17"><a href="materialized-views-1.html#cb17-17" aria-hidden="true"></a>           achilles_results.stratum_2,</span>
-<span id="cb17-18"><a href="materialized-views-1.html#cb17-18" aria-hidden="true"></a>           achilles_results.stratum_3</span>
-<span id="cb17-19"><a href="materialized-views-1.html#cb17-19" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb17-20"><a href="materialized-views-1.html#cb17-20" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">0</span>)) p <span class="kw">ON</span> ((p.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)))</span>
-<span id="cb17-21"><a href="materialized-views-1.html#cb17-21" aria-hidden="true"></a> <span class="kw">WHERE</span> (a.analysis_id <span class="op">=</span> <span class="dv">5000</span>);</span></code></pre></div>
+<div class="sourceCode" id="cb16"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb16-1"><a href="materialized-views-1.html#cb16-1" aria-hidden="true"></a><span class="kw">SELECT</span> data_source.acronym,</span>
+<span id="cb16-2"><a href="materialized-views-1.html#cb16-2" aria-hidden="true"></a>   data_source.name,</span>
+<span id="cb16-3"><a href="materialized-views-1.html#cb16-3" aria-hidden="true"></a>   data_source.database_type,</span>
+<span id="cb16-4"><a href="materialized-views-1.html#cb16-4" aria-hidden="true"></a>   country.country,</span>
+<span id="cb16-5"><a href="materialized-views-1.html#cb16-5" aria-hidden="true"></a>   p.count_value <span class="kw">AS</span> number_of_patients,</span>
+<span id="cb16-6"><a href="materialized-views-1.html#cb16-6" aria-hidden="true"></a>   a.stratum_2 <span class="kw">AS</span> source_release_date,</span>
+<span id="cb16-7"><a href="materialized-views-1.html#cb16-7" aria-hidden="true"></a>   a.stratum_3 <span class="kw">AS</span> cdm_release_date,</span>
+<span id="cb16-8"><a href="materialized-views-1.html#cb16-8" aria-hidden="true"></a>   a.stratum_4 <span class="kw">AS</span> cdm_version,</span>
+<span id="cb16-9"><a href="materialized-views-1.html#cb16-9" aria-hidden="true"></a>   a.stratum_5 <span class="kw">AS</span> vocabulary_version,</span>
+<span id="cb16-10"><a href="materialized-views-1.html#cb16-10" aria-hidden="true"></a>   p.stratum_3 <span class="kw">AS</span> execution_date,</span>
+<span id="cb16-11"><a href="materialized-views-1.html#cb16-11" aria-hidden="true"></a>   p.stratum_2 <span class="kw">AS</span> package_version</span>
+<span id="cb16-12"><a href="materialized-views-1.html#cb16-12" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results a</span>
+<span id="cb16-13"><a href="materialized-views-1.html#cb16-13" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">ON</span> ((a.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)))</span>
+<span id="cb16-14"><a href="materialized-views-1.html#cb16-14" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((data_source.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
+<span id="cb16-15"><a href="materialized-views-1.html#cb16-15" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.count_value,</span>
+<span id="cb16-16"><a href="materialized-views-1.html#cb16-16" aria-hidden="true"></a>            achilles_results.data_source_id,</span>
+<span id="cb16-17"><a href="materialized-views-1.html#cb16-17" aria-hidden="true"></a>            achilles_results.stratum_2,</span>
+<span id="cb16-18"><a href="materialized-views-1.html#cb16-18" aria-hidden="true"></a>            achilles_results.stratum_3</span>
+<span id="cb16-19"><a href="materialized-views-1.html#cb16-19" aria-hidden="true"></a>           <span class="kw">FROM</span> achilles_results</span>
+<span id="cb16-20"><a href="materialized-views-1.html#cb16-20" aria-hidden="true"></a>           <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">0</span>)) p</span>
+<span id="cb16-21"><a href="materialized-views-1.html#cb16-21" aria-hidden="true"></a>      <span class="kw">ON</span> p.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)</span>
+<span id="cb16-22"><a href="materialized-views-1.html#cb16-22" aria-hidden="true"></a> <span class="kw">WHERE</span> (a.analysis_id <span class="op">=</span> <span class="dv">5000</span>);</span></code></pre></div>
 </div>
 <div id="patients_per_country_and_database_type" class="section level3 unnumbered" number="">
 <h3>patients_per_country_and_database_type</h3>
-<div class="sourceCode" id="cb18"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb18-1"><a href="materialized-views-1.html#cb18-1" aria-hidden="true"></a><span class="kw">SELECT</span> country.country,</span>
-<span id="cb18-2"><a href="materialized-views-1.html#cb18-2" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
-<span id="cb18-3"><a href="materialized-views-1.html#cb18-3" aria-hidden="true"></a>   achilles.count_value</span>
-<span id="cb18-4"><a href="materialized-views-1.html#cb18-4" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
-<span id="cb18-5"><a href="materialized-views-1.html#cb18-5" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb18-6"><a href="materialized-views-1.html#cb18-6" aria-hidden="true"></a>    <span class="kw">JOIN</span> country country <span class="kw">ON</span> ((<span class="kw">source</span>.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
-<span id="cb18-7"><a href="materialized-views-1.html#cb18-7" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">1</span>);</span></code></pre></div>
+<div class="sourceCode" id="cb17"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb17-1"><a href="materialized-views-1.html#cb17-1" aria-hidden="true"></a><span class="kw">SELECT</span> country.country,</span>
+<span id="cb17-2"><a href="materialized-views-1.html#cb17-2" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
+<span id="cb17-3"><a href="materialized-views-1.html#cb17-3" aria-hidden="true"></a>   achilles.count_value</span>
+<span id="cb17-4"><a href="materialized-views-1.html#cb17-4" aria-hidden="true"></a>  <span class="kw">FROM</span> (</span>
+<span id="cb17-5"><a href="materialized-views-1.html#cb17-5" aria-hidden="true"></a>    (achilles_results achilles <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb17-6"><a href="materialized-views-1.html#cb17-6" aria-hidden="true"></a>      <span class="kw">ON</span> (achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>))</span>
+<span id="cb17-7"><a href="materialized-views-1.html#cb17-7" aria-hidden="true"></a>    <span class="kw">JOIN</span> country country <span class="kw">ON</span> <span class="kw">source</span>.country_id <span class="op">=</span> country.<span class="kw">id</span>)</span>
+<span id="cb17-8"><a href="materialized-views-1.html#cb17-8" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">1</span>);</span></code></pre></div>
 </div>
 <div id="number_of_patients" class="section level3 unnumbered" number="">
 <h3>number_of_patients</h3>
-<div class="sourceCode" id="cb19"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb19-1"><a href="materialized-views-1.html#cb19-1" aria-hidden="true"></a><span class="kw">SELECT</span> achilles_results.count_value,</span>
-<span id="cb19-2"><a href="materialized-views-1.html#cb19-2" aria-hidden="true"></a>   data_source.name,</span>
-<span id="cb19-3"><a href="materialized-views-1.html#cb19-3" aria-hidden="true"></a>   data_source.acronym,</span>
-<span id="cb19-4"><a href="materialized-views-1.html#cb19-4" aria-hidden="true"></a>   data_source.database_type,</span>
-<span id="cb19-5"><a href="materialized-views-1.html#cb19-5" aria-hidden="true"></a>   country.country</span>
-<span id="cb19-6"><a href="materialized-views-1.html#cb19-6" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results</span>
-<span id="cb19-7"><a href="materialized-views-1.html#cb19-7" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">ON</span> ((achilles_results.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)))</span>
-<span id="cb19-8"><a href="materialized-views-1.html#cb19-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((data_source.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
-<span id="cb19-9"><a href="materialized-views-1.html#cb19-9" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1</span>);</span></code></pre></div>
+<div class="sourceCode" id="cb18"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb18-1"><a href="materialized-views-1.html#cb18-1" aria-hidden="true"></a><span class="kw">SELECT</span> achilles_results.count_value,</span>
+<span id="cb18-2"><a href="materialized-views-1.html#cb18-2" aria-hidden="true"></a>   data_source.name,</span>
+<span id="cb18-3"><a href="materialized-views-1.html#cb18-3" aria-hidden="true"></a>   data_source.acronym,</span>
+<span id="cb18-4"><a href="materialized-views-1.html#cb18-4" aria-hidden="true"></a>   data_source.database_type,</span>
+<span id="cb18-5"><a href="materialized-views-1.html#cb18-5" aria-hidden="true"></a>   country.country</span>
+<span id="cb18-6"><a href="materialized-views-1.html#cb18-6" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results <span class="kw">JOIN</span> data_source</span>
+<span id="cb18-7"><a href="materialized-views-1.html#cb18-7" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles_results.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)))</span>
+<span id="cb18-8"><a href="materialized-views-1.html#cb18-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((data_source.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
+<span id="cb18-9"><a href="materialized-views-1.html#cb18-9" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1</span>);</span></code></pre></div>
 </div>
 <div id="gender" class="section level3 unnumbered" number="">
 <h3>gender</h3>
+<div class="sourceCode" id="cb19"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb19-1"><a href="materialized-views-1.html#cb19-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb19-2"><a href="materialized-views-1.html#cb19-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
+<span id="cb19-3"><a href="materialized-views-1.html#cb19-3" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
+<span id="cb19-4"><a href="materialized-views-1.html#cb19-4" aria-hidden="true"></a>   country.country,</span>
+<span id="cb19-5"><a href="materialized-views-1.html#cb19-5" aria-hidden="true"></a>   concept.concept_name <span class="kw">AS</span> gender,</span>
+<span id="cb19-6"><a href="materialized-views-1.html#cb19-6" aria-hidden="true"></a>   achilles.count_value</span>
+<span id="cb19-7"><a href="materialized-views-1.html#cb19-7" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results achilles</span>
+<span id="cb19-8"><a href="materialized-views-1.html#cb19-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb19-9"><a href="materialized-views-1.html#cb19-9" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
+<span id="cb19-10"><a href="materialized-views-1.html#cb19-10" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
+<span id="cb19-11"><a href="materialized-views-1.html#cb19-11" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept</span>
+<span id="cb19-12"><a href="materialized-views-1.html#cb19-12" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.stratum_1 <span class="op">=</span> (concept.concept_id):<span class="ch">:text</span>)))</span>
+<span id="cb19-13"><a href="materialized-views-1.html#cb19-13" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">2</span>);</span></code></pre></div>
+</div>
+<div id="age1observation_table" class="section level3 unnumbered" number="">
+<h3>age1observation_table</h3>
 <div class="sourceCode" id="cb20"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb20-1"><a href="materialized-views-1.html#cb20-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
 <span id="cb20-2"><a href="materialized-views-1.html#cb20-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
 <span id="cb20-3"><a href="materialized-views-1.html#cb20-3" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
 <span id="cb20-4"><a href="materialized-views-1.html#cb20-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb20-5"><a href="materialized-views-1.html#cb20-5" aria-hidden="true"></a>   concept.concept_name <span class="kw">AS</span> gender,</span>
-<span id="cb20-6"><a href="materialized-views-1.html#cb20-6" aria-hidden="true"></a>   achilles.count_value</span>
-<span id="cb20-7"><a href="materialized-views-1.html#cb20-7" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results achilles</span>
-<span id="cb20-8"><a href="materialized-views-1.html#cb20-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb20-9"><a href="materialized-views-1.html#cb20-9" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
-<span id="cb20-10"><a href="materialized-views-1.html#cb20-10" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept <span class="kw">ON</span> ((achilles.stratum_1 <span class="op">=</span> (concept.concept_id):<span class="ch">:text</span>)))</span>
-<span id="cb20-11"><a href="materialized-views-1.html#cb20-11" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">2</span>);</span></code></pre></div>
-</div>
-<div id="age1observation_table" class="section level3 unnumbered" number="">
-<h3>age1observation_table</h3>
-<div class="sourceCode" id="cb21"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb21-1"><a href="materialized-views-1.html#cb21-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb21-2"><a href="materialized-views-1.html#cb21-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb21-3"><a href="materialized-views-1.html#cb21-3" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
-<span id="cb21-4"><a href="materialized-views-1.html#cb21-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb21-5"><a href="materialized-views-1.html#cb21-5" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
-<span id="cb21-6"><a href="materialized-views-1.html#cb21-6" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb21-7"><a href="materialized-views-1.html#cb21-7" aria-hidden="true"></a>           <span class="cf">WHEN</span> ((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&lt;</span> <span class="dv">10</span>) <span class="cf">THEN</span> achilles.count_value</span>
-<span id="cb21-8"><a href="materialized-views-1.html#cb21-8" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:bigint</span></span>
-<span id="cb21-9"><a href="materialized-views-1.html#cb21-9" aria-hidden="true"></a>       <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;0-10&quot;</span>,</span>
-<span id="cb21-10"><a href="materialized-views-1.html#cb21-10" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
-<span id="cb21-11"><a href="materialized-views-1.html#cb21-11" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb21-12"><a href="materialized-views-1.html#cb21-12" aria-hidden="true"></a>           <span class="cf">WHEN</span> (((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&gt;=</span> <span class="dv">10</span>) <span class="kw">AND</span> ((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&lt;</span> <span class="dv">20</span>)) <span class="cf">THEN</span> achilles.count_value</span>
-<span id="cb21-13"><a href="materialized-views-1.html#cb21-13" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:bigint</span></span>
-<span id="cb21-14"><a href="materialized-views-1.html#cb21-14" aria-hidden="true"></a>       <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;10-20&quot;</span>,</span>
-<span id="cb21-15"><a href="materialized-views-1.html#cb21-15" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
-<span id="cb21-16"><a href="materialized-views-1.html#cb21-16" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb21-17"><a href="materialized-views-1.html#cb21-17" aria-hidden="true"></a>           <span class="cf">WHEN</span> (((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&gt;=</span> <span class="dv">20</span>) <span class="kw">AND</span> ((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&lt;</span> <span class="dv">30</span>)) <span class="cf">THEN</span> achilles.count_value</span>
-<span id="cb21-18"><a href="materialized-views-1.html#cb21-18" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:bigint</span></span>
-<span id="cb21-19"><a href="materialized-views-1.html#cb21-19" aria-hidden="true"></a>       <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;20-30&quot;</span>,</span>
-<span id="cb21-20"><a href="materialized-views-1.html#cb21-20" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
-<span id="cb21-21"><a href="materialized-views-1.html#cb21-21" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb21-22"><a href="materialized-views-1.html#cb21-22" aria-hidden="true"></a>           <span class="cf">WHEN</span> (((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&gt;=</span> <span class="dv">30</span>) <span class="kw">AND</span> ((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&lt;</span> <span class="dv">40</span>)) <span class="cf">THEN</span> achilles.count_value</span>
-<span id="cb21-23"><a href="materialized-views-1.html#cb21-23" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:bigint</span></span>
-<span id="cb21-24"><a href="materialized-views-1.html#cb21-24" aria-hidden="true"></a>       <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;30-40&quot;</span>,</span>
-<span id="cb21-25"><a href="materialized-views-1.html#cb21-25" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
-<span id="cb21-26"><a href="materialized-views-1.html#cb21-26" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb21-27"><a href="materialized-views-1.html#cb21-27" aria-hidden="true"></a>           <span class="cf">WHEN</span> (((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&gt;=</span> <span class="dv">40</span>) <span class="kw">AND</span> ((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&lt;</span> <span class="dv">50</span>)) <span class="cf">THEN</span> achilles.count_value</span>
-<span id="cb21-28"><a href="materialized-views-1.html#cb21-28" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:bigint</span></span>
-<span id="cb21-29"><a href="materialized-views-1.html#cb21-29" aria-hidden="true"></a>       <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;40-50&quot;</span>,</span>
-<span id="cb21-30"><a href="materialized-views-1.html#cb21-30" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
-<span id="cb21-31"><a href="materialized-views-1.html#cb21-31" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb21-32"><a href="materialized-views-1.html#cb21-32" aria-hidden="true"></a>           <span class="cf">WHEN</span> (((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&gt;=</span> <span class="dv">50</span>) <span class="kw">AND</span> ((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&lt;</span> <span class="dv">60</span>)) <span class="cf">THEN</span> achilles.count_value</span>
-<span id="cb21-33"><a href="materialized-views-1.html#cb21-33" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:bigint</span></span>
-<span id="cb21-34"><a href="materialized-views-1.html#cb21-34" aria-hidden="true"></a>       <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;50-60&quot;</span>,</span>
-<span id="cb21-35"><a href="materialized-views-1.html#cb21-35" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
-<span id="cb21-36"><a href="materialized-views-1.html#cb21-36" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb21-37"><a href="materialized-views-1.html#cb21-37" aria-hidden="true"></a>           <span class="cf">WHEN</span> (((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&gt;=</span> <span class="dv">60</span>) <span class="kw">AND</span> ((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&lt;</span> <span class="dv">70</span>)) <span class="cf">THEN</span> achilles.count_value</span>
-<span id="cb21-38"><a href="materialized-views-1.html#cb21-38" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:bigint</span></span>
-<span id="cb21-39"><a href="materialized-views-1.html#cb21-39" aria-hidden="true"></a>       <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;60-70&quot;</span>,</span>
-<span id="cb21-40"><a href="materialized-views-1.html#cb21-40" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
-<span id="cb21-41"><a href="materialized-views-1.html#cb21-41" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb21-42"><a href="materialized-views-1.html#cb21-42" aria-hidden="true"></a>           <span class="cf">WHEN</span> (((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&gt;=</span> <span class="dv">70</span>) <span class="kw">AND</span> ((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&lt;</span> <span class="dv">80</span>)) <span class="cf">THEN</span> achilles.count_value</span>
-<span id="cb21-43"><a href="materialized-views-1.html#cb21-43" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:bigint</span></span>
-<span id="cb21-44"><a href="materialized-views-1.html#cb21-44" aria-hidden="true"></a>       <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;70-80&quot;</span>,</span>
-<span id="cb21-45"><a href="materialized-views-1.html#cb21-45" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
-<span id="cb21-46"><a href="materialized-views-1.html#cb21-46" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb21-47"><a href="materialized-views-1.html#cb21-47" aria-hidden="true"></a>           <span class="cf">WHEN</span> (((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&gt;=</span> <span class="dv">80</span>) <span class="kw">AND</span> ((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&lt;</span> <span class="dv">90</span>)) <span class="cf">THEN</span> achilles.count_value</span>
-<span id="cb21-48"><a href="materialized-views-1.html#cb21-48" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:bigint</span></span>
-<span id="cb21-49"><a href="materialized-views-1.html#cb21-49" aria-hidden="true"></a>       <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;80-90&quot;</span>,</span>
-<span id="cb21-50"><a href="materialized-views-1.html#cb21-50" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
-<span id="cb21-51"><a href="materialized-views-1.html#cb21-51" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb21-52"><a href="materialized-views-1.html#cb21-52" aria-hidden="true"></a>           <span class="cf">WHEN</span> ((achilles.stratum_2):<span class="ch">:integer</span> <span class="op">&gt;=</span> <span class="dv">90</span>) <span class="cf">THEN</span> achilles.count_value</span>
-<span id="cb21-53"><a href="materialized-views-1.html#cb21-53" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:bigint</span></span>
-<span id="cb21-54"><a href="materialized-views-1.html#cb21-54" aria-hidden="true"></a>       <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;90+&quot;</span></span>
-<span id="cb21-55"><a href="materialized-views-1.html#cb21-55" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results achilles</span>
-<span id="cb21-56"><a href="materialized-views-1.html#cb21-56" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb21-57"><a href="materialized-views-1.html#cb21-57" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
-<span id="cb21-58"><a href="materialized-views-1.html#cb21-58" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept <span class="kw">ON</span> ((achilles.stratum_1 <span class="op">=</span> (concept.concept_id):<span class="ch">:text</span>)))</span>
-<span id="cb21-59"><a href="materialized-views-1.html#cb21-59" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">102</span>)</span>
-<span id="cb21-60"><a href="materialized-views-1.html#cb21-60" aria-hidden="true"></a> <span class="kw">GROUP</span> <span class="kw">BY</span> <span class="kw">source</span>.name, <span class="kw">source</span>.acronym, <span class="kw">source</span>.database_type, country.country;</span></code></pre></div>
+<span id="cb20-5"><a href="materialized-views-1.html#cb20-5" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
+<span id="cb20-6"><a href="materialized-views-1.html#cb20-6" aria-hidden="true"></a>     <span class="cf">CASE</span> <span class="cf">WHEN</span> (</span>
+<span id="cb20-7"><a href="materialized-views-1.html#cb20-7" aria-hidden="true"></a>       (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&lt;</span> <span class="dv">10</span></span>
+<span id="cb20-8"><a href="materialized-views-1.html#cb20-8" aria-hidden="true"></a>     ) <span class="cf">THEN</span> achilles.count_value <span class="cf">ELSE</span> <span class="kw">NULL</span> :: bigint <span class="cf">END</span></span>
+<span id="cb20-9"><a href="materialized-views-1.html#cb20-9" aria-hidden="true"></a>   ) <span class="kw">AS</span> <span class="ot">&quot;0-10&quot;</span>, </span>
+<span id="cb20-10"><a href="materialized-views-1.html#cb20-10" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
+<span id="cb20-11"><a href="materialized-views-1.html#cb20-11" aria-hidden="true"></a>     <span class="cf">CASE</span> <span class="cf">WHEN</span> (</span>
+<span id="cb20-12"><a href="materialized-views-1.html#cb20-12" aria-hidden="true"></a>       (</span>
+<span id="cb20-13"><a href="materialized-views-1.html#cb20-13" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&gt;=</span> <span class="dv">10</span></span>
+<span id="cb20-14"><a href="materialized-views-1.html#cb20-14" aria-hidden="true"></a>       ) </span>
+<span id="cb20-15"><a href="materialized-views-1.html#cb20-15" aria-hidden="true"></a>       <span class="kw">AND</span> (</span>
+<span id="cb20-16"><a href="materialized-views-1.html#cb20-16" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&lt;</span> <span class="dv">20</span></span>
+<span id="cb20-17"><a href="materialized-views-1.html#cb20-17" aria-hidden="true"></a>       )</span>
+<span id="cb20-18"><a href="materialized-views-1.html#cb20-18" aria-hidden="true"></a>     ) <span class="cf">THEN</span> achilles.count_value <span class="cf">ELSE</span> <span class="kw">NULL</span> :: bigint <span class="cf">END</span></span>
+<span id="cb20-19"><a href="materialized-views-1.html#cb20-19" aria-hidden="true"></a>   ) <span class="kw">AS</span> <span class="ot">&quot;10-20&quot;</span>, </span>
+<span id="cb20-20"><a href="materialized-views-1.html#cb20-20" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
+<span id="cb20-21"><a href="materialized-views-1.html#cb20-21" aria-hidden="true"></a>     <span class="cf">CASE</span> <span class="cf">WHEN</span> (</span>
+<span id="cb20-22"><a href="materialized-views-1.html#cb20-22" aria-hidden="true"></a>       (</span>
+<span id="cb20-23"><a href="materialized-views-1.html#cb20-23" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&gt;=</span> <span class="dv">20</span></span>
+<span id="cb20-24"><a href="materialized-views-1.html#cb20-24" aria-hidden="true"></a>       ) </span>
+<span id="cb20-25"><a href="materialized-views-1.html#cb20-25" aria-hidden="true"></a>       <span class="kw">AND</span> (</span>
+<span id="cb20-26"><a href="materialized-views-1.html#cb20-26" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&lt;</span> <span class="dv">30</span></span>
+<span id="cb20-27"><a href="materialized-views-1.html#cb20-27" aria-hidden="true"></a>       )</span>
+<span id="cb20-28"><a href="materialized-views-1.html#cb20-28" aria-hidden="true"></a>     ) <span class="cf">THEN</span> achilles.count_value <span class="cf">ELSE</span> <span class="kw">NULL</span> :: bigint <span class="cf">END</span></span>
+<span id="cb20-29"><a href="materialized-views-1.html#cb20-29" aria-hidden="true"></a>   ) <span class="kw">AS</span> <span class="ot">&quot;20-30&quot;</span>, </span>
+<span id="cb20-30"><a href="materialized-views-1.html#cb20-30" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
+<span id="cb20-31"><a href="materialized-views-1.html#cb20-31" aria-hidden="true"></a>     <span class="cf">CASE</span> <span class="cf">WHEN</span> (</span>
+<span id="cb20-32"><a href="materialized-views-1.html#cb20-32" aria-hidden="true"></a>       (</span>
+<span id="cb20-33"><a href="materialized-views-1.html#cb20-33" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&gt;=</span> <span class="dv">30</span></span>
+<span id="cb20-34"><a href="materialized-views-1.html#cb20-34" aria-hidden="true"></a>       ) </span>
+<span id="cb20-35"><a href="materialized-views-1.html#cb20-35" aria-hidden="true"></a>       <span class="kw">AND</span> (</span>
+<span id="cb20-36"><a href="materialized-views-1.html#cb20-36" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&lt;</span> <span class="dv">40</span></span>
+<span id="cb20-37"><a href="materialized-views-1.html#cb20-37" aria-hidden="true"></a>       )</span>
+<span id="cb20-38"><a href="materialized-views-1.html#cb20-38" aria-hidden="true"></a>     ) <span class="cf">THEN</span> achilles.count_value <span class="cf">ELSE</span> <span class="kw">NULL</span> :: bigint <span class="cf">END</span></span>
+<span id="cb20-39"><a href="materialized-views-1.html#cb20-39" aria-hidden="true"></a>   ) <span class="kw">AS</span> <span class="ot">&quot;30-40&quot;</span>, </span>
+<span id="cb20-40"><a href="materialized-views-1.html#cb20-40" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
+<span id="cb20-41"><a href="materialized-views-1.html#cb20-41" aria-hidden="true"></a>     <span class="cf">CASE</span> <span class="cf">WHEN</span> (</span>
+<span id="cb20-42"><a href="materialized-views-1.html#cb20-42" aria-hidden="true"></a>       (</span>
+<span id="cb20-43"><a href="materialized-views-1.html#cb20-43" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&gt;=</span> <span class="dv">40</span></span>
+<span id="cb20-44"><a href="materialized-views-1.html#cb20-44" aria-hidden="true"></a>       ) </span>
+<span id="cb20-45"><a href="materialized-views-1.html#cb20-45" aria-hidden="true"></a>       <span class="kw">AND</span> (</span>
+<span id="cb20-46"><a href="materialized-views-1.html#cb20-46" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&lt;</span> <span class="dv">50</span></span>
+<span id="cb20-47"><a href="materialized-views-1.html#cb20-47" aria-hidden="true"></a>       )</span>
+<span id="cb20-48"><a href="materialized-views-1.html#cb20-48" aria-hidden="true"></a>     ) <span class="cf">THEN</span> achilles.count_value <span class="cf">ELSE</span> <span class="kw">NULL</span> :: bigint <span class="cf">END</span></span>
+<span id="cb20-49"><a href="materialized-views-1.html#cb20-49" aria-hidden="true"></a>   ) <span class="kw">AS</span> <span class="ot">&quot;40-50&quot;</span>, </span>
+<span id="cb20-50"><a href="materialized-views-1.html#cb20-50" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
+<span id="cb20-51"><a href="materialized-views-1.html#cb20-51" aria-hidden="true"></a>     <span class="cf">CASE</span> <span class="cf">WHEN</span> (</span>
+<span id="cb20-52"><a href="materialized-views-1.html#cb20-52" aria-hidden="true"></a>       (</span>
+<span id="cb20-53"><a href="materialized-views-1.html#cb20-53" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&gt;=</span> <span class="dv">50</span></span>
+<span id="cb20-54"><a href="materialized-views-1.html#cb20-54" aria-hidden="true"></a>       ) </span>
+<span id="cb20-55"><a href="materialized-views-1.html#cb20-55" aria-hidden="true"></a>       <span class="kw">AND</span> (</span>
+<span id="cb20-56"><a href="materialized-views-1.html#cb20-56" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&lt;</span> <span class="dv">60</span></span>
+<span id="cb20-57"><a href="materialized-views-1.html#cb20-57" aria-hidden="true"></a>       )</span>
+<span id="cb20-58"><a href="materialized-views-1.html#cb20-58" aria-hidden="true"></a>     ) <span class="cf">THEN</span> achilles.count_value <span class="cf">ELSE</span> <span class="kw">NULL</span> :: bigint <span class="cf">END</span></span>
+<span id="cb20-59"><a href="materialized-views-1.html#cb20-59" aria-hidden="true"></a>   ) <span class="kw">AS</span> <span class="ot">&quot;50-60&quot;</span>, </span>
+<span id="cb20-60"><a href="materialized-views-1.html#cb20-60" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
+<span id="cb20-61"><a href="materialized-views-1.html#cb20-61" aria-hidden="true"></a>     <span class="cf">CASE</span> <span class="cf">WHEN</span> (</span>
+<span id="cb20-62"><a href="materialized-views-1.html#cb20-62" aria-hidden="true"></a>       (</span>
+<span id="cb20-63"><a href="materialized-views-1.html#cb20-63" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&gt;=</span> <span class="dv">60</span></span>
+<span id="cb20-64"><a href="materialized-views-1.html#cb20-64" aria-hidden="true"></a>       ) </span>
+<span id="cb20-65"><a href="materialized-views-1.html#cb20-65" aria-hidden="true"></a>       <span class="kw">AND</span> (</span>
+<span id="cb20-66"><a href="materialized-views-1.html#cb20-66" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&lt;</span> <span class="dv">70</span></span>
+<span id="cb20-67"><a href="materialized-views-1.html#cb20-67" aria-hidden="true"></a>       )</span>
+<span id="cb20-68"><a href="materialized-views-1.html#cb20-68" aria-hidden="true"></a>     ) <span class="cf">THEN</span> achilles.count_value <span class="cf">ELSE</span> <span class="kw">NULL</span> :: bigint <span class="cf">END</span></span>
+<span id="cb20-69"><a href="materialized-views-1.html#cb20-69" aria-hidden="true"></a>   ) <span class="kw">AS</span> <span class="ot">&quot;60-70&quot;</span>, </span>
+<span id="cb20-70"><a href="materialized-views-1.html#cb20-70" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
+<span id="cb20-71"><a href="materialized-views-1.html#cb20-71" aria-hidden="true"></a>     <span class="cf">CASE</span> <span class="cf">WHEN</span> (</span>
+<span id="cb20-72"><a href="materialized-views-1.html#cb20-72" aria-hidden="true"></a>       (</span>
+<span id="cb20-73"><a href="materialized-views-1.html#cb20-73" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&gt;=</span> <span class="dv">70</span></span>
+<span id="cb20-74"><a href="materialized-views-1.html#cb20-74" aria-hidden="true"></a>       ) </span>
+<span id="cb20-75"><a href="materialized-views-1.html#cb20-75" aria-hidden="true"></a>       <span class="kw">AND</span> (</span>
+<span id="cb20-76"><a href="materialized-views-1.html#cb20-76" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&lt;</span> <span class="dv">80</span></span>
+<span id="cb20-77"><a href="materialized-views-1.html#cb20-77" aria-hidden="true"></a>       )</span>
+<span id="cb20-78"><a href="materialized-views-1.html#cb20-78" aria-hidden="true"></a>     ) <span class="cf">THEN</span> achilles.count_value <span class="cf">ELSE</span> <span class="kw">NULL</span> :: bigint <span class="cf">END</span></span>
+<span id="cb20-79"><a href="materialized-views-1.html#cb20-79" aria-hidden="true"></a>   ) <span class="kw">AS</span> <span class="ot">&quot;70-80&quot;</span>, </span>
+<span id="cb20-80"><a href="materialized-views-1.html#cb20-80" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
+<span id="cb20-81"><a href="materialized-views-1.html#cb20-81" aria-hidden="true"></a>     <span class="cf">CASE</span> <span class="cf">WHEN</span> (</span>
+<span id="cb20-82"><a href="materialized-views-1.html#cb20-82" aria-hidden="true"></a>       (</span>
+<span id="cb20-83"><a href="materialized-views-1.html#cb20-83" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&gt;=</span> <span class="dv">80</span></span>
+<span id="cb20-84"><a href="materialized-views-1.html#cb20-84" aria-hidden="true"></a>       ) </span>
+<span id="cb20-85"><a href="materialized-views-1.html#cb20-85" aria-hidden="true"></a>       <span class="kw">AND</span> (</span>
+<span id="cb20-86"><a href="materialized-views-1.html#cb20-86" aria-hidden="true"></a>         (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&lt;</span> <span class="dv">90</span></span>
+<span id="cb20-87"><a href="materialized-views-1.html#cb20-87" aria-hidden="true"></a>       )</span>
+<span id="cb20-88"><a href="materialized-views-1.html#cb20-88" aria-hidden="true"></a>     ) <span class="cf">THEN</span> achilles.count_value <span class="cf">ELSE</span> <span class="kw">NULL</span> :: bigint <span class="cf">END</span></span>
+<span id="cb20-89"><a href="materialized-views-1.html#cb20-89" aria-hidden="true"></a>   ) <span class="kw">AS</span> <span class="ot">&quot;80-90&quot;</span>, </span>
+<span id="cb20-90"><a href="materialized-views-1.html#cb20-90" aria-hidden="true"></a>   <span class="fu">sum</span>(</span>
+<span id="cb20-91"><a href="materialized-views-1.html#cb20-91" aria-hidden="true"></a>     <span class="cf">CASE</span> <span class="cf">WHEN</span> (</span>
+<span id="cb20-92"><a href="materialized-views-1.html#cb20-92" aria-hidden="true"></a>       (achilles.stratum_2):: <span class="dt">integer</span> <span class="op">&gt;=</span> <span class="dv">90</span></span>
+<span id="cb20-93"><a href="materialized-views-1.html#cb20-93" aria-hidden="true"></a>     ) <span class="cf">THEN</span> achilles.count_value <span class="cf">ELSE</span> <span class="kw">NULL</span> :: bigint <span class="cf">END</span></span>
+<span id="cb20-94"><a href="materialized-views-1.html#cb20-94" aria-hidden="true"></a>   ) <span class="kw">AS</span> <span class="ot">&quot;90+&quot;</span> </span>
+<span id="cb20-95"><a href="materialized-views-1.html#cb20-95" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results achilles</span>
+<span id="cb20-96"><a href="materialized-views-1.html#cb20-96" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb20-97"><a href="materialized-views-1.html#cb20-97" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
+<span id="cb20-98"><a href="materialized-views-1.html#cb20-98" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
+<span id="cb20-99"><a href="materialized-views-1.html#cb20-99" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept</span>
+<span id="cb20-100"><a href="materialized-views-1.html#cb20-100" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.stratum_1 <span class="op">=</span> (concept.concept_id):<span class="ch">:text</span>)))</span>
+<span id="cb20-101"><a href="materialized-views-1.html#cb20-101" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">102</span>)</span>
+<span id="cb20-102"><a href="materialized-views-1.html#cb20-102" aria-hidden="true"></a> <span class="kw">GROUP</span> <span class="kw">BY</span> </span>
+<span id="cb20-103"><a href="materialized-views-1.html#cb20-103" aria-hidden="true"></a>   <span class="kw">source</span>.name, </span>
+<span id="cb20-104"><a href="materialized-views-1.html#cb20-104" aria-hidden="true"></a>   <span class="kw">source</span>.acronym, </span>
+<span id="cb20-105"><a href="materialized-views-1.html#cb20-105" aria-hidden="true"></a>   <span class="kw">source</span>.database_type, </span>
+<span id="cb20-106"><a href="materialized-views-1.html#cb20-106" aria-hidden="true"></a>   country.country;</span></code></pre></div>
 </div>
 <div id="age1observation_bar_chart" class="section level3 unnumbered" number="">
 <h3>age1observation_bar_chart</h3>
-<div class="sourceCode" id="cb22"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb22-1"><a href="materialized-views-1.html#cb22-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb22-2"><a href="materialized-views-1.html#cb22-2" aria-hidden="true"></a>   (achilles.stratum_1):<span class="ch">:integer</span> <span class="kw">AS</span> age,</span>
-<span id="cb22-3"><a href="materialized-views-1.html#cb22-3" aria-hidden="true"></a>   achilles.count_value <span class="kw">AS</span> <span class="fu">count</span>,</span>
-<span id="cb22-4"><a href="materialized-views-1.html#cb22-4" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb22-5"><a href="materialized-views-1.html#cb22-5" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
-<span id="cb22-6"><a href="materialized-views-1.html#cb22-6" aria-hidden="true"></a>   country.country</span>
-<span id="cb22-7"><a href="materialized-views-1.html#cb22-7" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
-<span id="cb22-8"><a href="materialized-views-1.html#cb22-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb22-9"><a href="materialized-views-1.html#cb22-9" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
-<span id="cb22-10"><a href="materialized-views-1.html#cb22-10" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">101</span>);</span></code></pre></div>
+<div class="sourceCode" id="cb21"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb21-1"><a href="materialized-views-1.html#cb21-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb21-2"><a href="materialized-views-1.html#cb21-2" aria-hidden="true"></a>   (achilles.stratum_1):<span class="ch">:integer</span> <span class="kw">AS</span> age,</span>
+<span id="cb21-3"><a href="materialized-views-1.html#cb21-3" aria-hidden="true"></a>   achilles.count_value <span class="kw">AS</span> <span class="fu">count</span>,</span>
+<span id="cb21-4"><a href="materialized-views-1.html#cb21-4" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
+<span id="cb21-5"><a href="materialized-views-1.html#cb21-5" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
+<span id="cb21-6"><a href="materialized-views-1.html#cb21-6" aria-hidden="true"></a>   country.country</span>
+<span id="cb21-7"><a href="materialized-views-1.html#cb21-7" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
+<span id="cb21-8"><a href="materialized-views-1.html#cb21-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb21-9"><a href="materialized-views-1.html#cb21-9" aria-hidden="true"></a>      <span class="kw">ON</span> achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)</span>
+<span id="cb21-10"><a href="materialized-views-1.html#cb21-10" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
+<span id="cb21-11"><a href="materialized-views-1.html#cb21-11" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">101</span>);</span></code></pre></div>
 </div>
 <div id="distribution_of_age_at_first_observation_period" class="section level3 unnumbered" number="">
 <h3>distribution_of_age_at_first_observation_period</h3>
-<div class="sourceCode" id="cb23"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb23-1"><a href="materialized-views-1.html#cb23-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb23-2"><a href="materialized-views-1.html#cb23-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb23-3"><a href="materialized-views-1.html#cb23-3" aria-hidden="true"></a>   country.country,</span>
-<span id="cb23-4"><a href="materialized-views-1.html#cb23-4" aria-hidden="true"></a>   achilles.count_value,</span>
-<span id="cb23-5"><a href="materialized-views-1.html#cb23-5" aria-hidden="true"></a>   achilles.p10_value <span class="kw">AS</span> p10,</span>
-<span id="cb23-6"><a href="materialized-views-1.html#cb23-6" aria-hidden="true"></a>   achilles.p25_value <span class="kw">AS</span> p25,</span>
-<span id="cb23-7"><a href="materialized-views-1.html#cb23-7" aria-hidden="true"></a>   achilles.median_value <span class="kw">AS</span> <span class="fu">median</span>,</span>
-<span id="cb23-8"><a href="materialized-views-1.html#cb23-8" aria-hidden="true"></a>   achilles.p75_value <span class="kw">AS</span> p75,</span>
-<span id="cb23-9"><a href="materialized-views-1.html#cb23-9" aria-hidden="true"></a>   achilles.p90_value <span class="kw">AS</span> p90,</span>
-<span id="cb23-10"><a href="materialized-views-1.html#cb23-10" aria-hidden="true"></a>   achilles.max_value,</span>
-<span id="cb23-11"><a href="materialized-views-1.html#cb23-11" aria-hidden="true"></a>   achilles.min_value</span>
-<span id="cb23-12"><a href="materialized-views-1.html#cb23-12" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
-<span id="cb23-13"><a href="materialized-views-1.html#cb23-13" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb23-14"><a href="materialized-views-1.html#cb23-14" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((<span class="kw">source</span>.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
-<span id="cb23-15"><a href="materialized-views-1.html#cb23-15" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">103</span>)</span>
-<span id="cb23-16"><a href="materialized-views-1.html#cb23-16" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> <span class="kw">source</span>.name;</span></code></pre></div>
+<div class="sourceCode" id="cb22"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb22-1"><a href="materialized-views-1.html#cb22-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb22-2"><a href="materialized-views-1.html#cb22-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
+<span id="cb22-3"><a href="materialized-views-1.html#cb22-3" aria-hidden="true"></a>   country.country,</span>
+<span id="cb22-4"><a href="materialized-views-1.html#cb22-4" aria-hidden="true"></a>   achilles.count_value,</span>
+<span id="cb22-5"><a href="materialized-views-1.html#cb22-5" aria-hidden="true"></a>   achilles.p10_value <span class="kw">AS</span> p10,</span>
+<span id="cb22-6"><a href="materialized-views-1.html#cb22-6" aria-hidden="true"></a>   achilles.p25_value <span class="kw">AS</span> p25,</span>
+<span id="cb22-7"><a href="materialized-views-1.html#cb22-7" aria-hidden="true"></a>   achilles.median_value <span class="kw">AS</span> <span class="fu">median</span>,</span>
+<span id="cb22-8"><a href="materialized-views-1.html#cb22-8" aria-hidden="true"></a>   achilles.p75_value <span class="kw">AS</span> p75,</span>
+<span id="cb22-9"><a href="materialized-views-1.html#cb22-9" aria-hidden="true"></a>   achilles.p90_value <span class="kw">AS</span> p90,</span>
+<span id="cb22-10"><a href="materialized-views-1.html#cb22-10" aria-hidden="true"></a>   achilles.max_value,</span>
+<span id="cb22-11"><a href="materialized-views-1.html#cb22-11" aria-hidden="true"></a>   achilles.min_value</span>
+<span id="cb22-12"><a href="materialized-views-1.html#cb22-12" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
+<span id="cb22-13"><a href="materialized-views-1.html#cb22-13" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb22-14"><a href="materialized-views-1.html#cb22-14" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
+<span id="cb22-15"><a href="materialized-views-1.html#cb22-15" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((<span class="kw">source</span>.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
+<span id="cb22-16"><a href="materialized-views-1.html#cb22-16" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">103</span>)</span>
+<span id="cb22-17"><a href="materialized-views-1.html#cb22-17" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> <span class="kw">source</span>.name;</span></code></pre></div>
 </div>
 <div id="year_of_birth" class="section level3 unnumbered" number="">
 <h3>year_of_birth</h3>
+<div class="sourceCode" id="cb23"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb23-1"><a href="materialized-views-1.html#cb23-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb23-2"><a href="materialized-views-1.html#cb23-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
+<span id="cb23-3"><a href="materialized-views-1.html#cb23-3" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
+<span id="cb23-4"><a href="materialized-views-1.html#cb23-4" aria-hidden="true"></a>   country.country,</span>
+<span id="cb23-5"><a href="materialized-views-1.html#cb23-5" aria-hidden="true"></a>   achilles.stratum_1 <span class="kw">AS</span> <span class="ot">&quot;Birth_year&quot;</span>,</span>
+<span id="cb23-6"><a href="materialized-views-1.html#cb23-6" aria-hidden="true"></a>   achilles.count_value <span class="kw">AS</span> <span class="fu">count</span></span>
+<span id="cb23-7"><a href="materialized-views-1.html#cb23-7" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
+<span id="cb23-8"><a href="materialized-views-1.html#cb23-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb23-9"><a href="materialized-views-1.html#cb23-9" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
+<span id="cb23-10"><a href="materialized-views-1.html#cb23-10" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
+<span id="cb23-11"><a href="materialized-views-1.html#cb23-11" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">3</span>);</span></code></pre></div>
+</div>
+<div id="avg_num_of_records_per_person" class="section level3 unnumbered" number="">
+<h3>avg_num_of_records_per_person</h3>
 <div class="sourceCode" id="cb24"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb24-1"><a href="materialized-views-1.html#cb24-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
 <span id="cb24-2"><a href="materialized-views-1.html#cb24-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
 <span id="cb24-3"><a href="materialized-views-1.html#cb24-3" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
 <span id="cb24-4"><a href="materialized-views-1.html#cb24-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb24-5"><a href="materialized-views-1.html#cb24-5" aria-hidden="true"></a>   achilles.stratum_1 <span class="kw">AS</span> <span class="ot">&quot;Birth_year&quot;</span>,</span>
-<span id="cb24-6"><a href="materialized-views-1.html#cb24-6" aria-hidden="true"></a>   achilles.count_value <span class="kw">AS</span> <span class="fu">count</span></span>
-<span id="cb24-7"><a href="materialized-views-1.html#cb24-7" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
-<span id="cb24-8"><a href="materialized-views-1.html#cb24-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb24-9"><a href="materialized-views-1.html#cb24-9" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
-<span id="cb24-10"><a href="materialized-views-1.html#cb24-10" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">3</span>);</span></code></pre></div>
-</div>
-<div id="avg_num_of_records_per_person" class="section level3 unnumbered" number="">
-<h3>avg_num_of_records_per_person</h3>
-<div class="sourceCode" id="cb25"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb25-1"><a href="materialized-views-1.html#cb25-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb25-2"><a href="materialized-views-1.html#cb25-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb25-3"><a href="materialized-views-1.html#cb25-3" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
-<span id="cb25-4"><a href="materialized-views-1.html#cb25-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb25-5"><a href="materialized-views-1.html#cb25-5" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb25-6"><a href="materialized-views-1.html#cb25-6" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">201</span>) <span class="cf">THEN</span> <span class="st">&#39;Visit&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb25-7"><a href="materialized-views-1.html#cb25-7" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">401</span>) <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb25-8"><a href="materialized-views-1.html#cb25-8" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">501</span>) <span class="cf">THEN</span> <span class="st">&#39;Death&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb25-9"><a href="materialized-views-1.html#cb25-9" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">601</span>) <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb25-10"><a href="materialized-views-1.html#cb25-10" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">701</span>) <span class="cf">THEN</span> <span class="st">&#39;Drug Exposure&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb25-11"><a href="materialized-views-1.html#cb25-11" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">801</span>) <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb25-12"><a href="materialized-views-1.html#cb25-12" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">1801</span>) <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb25-13"><a href="materialized-views-1.html#cb25-13" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">2101</span>) <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb25-14"><a href="materialized-views-1.html#cb25-14" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">2201</span>) <span class="cf">THEN</span> <span class="st">&#39;Note&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb25-15"><a href="materialized-views-1.html#cb25-15" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:text</span></span>
-<span id="cb25-16"><a href="materialized-views-1.html#cb25-16" aria-hidden="true"></a>       <span class="cf">END</span> <span class="kw">AS</span> data_domain,</span>
-<span id="cb25-17"><a href="materialized-views-1.html#cb25-17" aria-hidden="true"></a>   (<span class="fu">sum</span>(achilles.count_value) <span class="op">/</span> <span class="fu">avg</span>(counts.num_persons)) <span class="kw">AS</span> records_per_person</span>
-<span id="cb25-18"><a href="materialized-views-1.html#cb25-18" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results achilles</span>
-<span id="cb25-19"><a href="materialized-views-1.html#cb25-19" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb25-20"><a href="materialized-views-1.html#cb25-20" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
-<span id="cb25-21"><a href="materialized-views-1.html#cb25-21" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.data_source_id,</span>
-<span id="cb25-22"><a href="materialized-views-1.html#cb25-22" aria-hidden="true"></a>           achilles_results.count_value <span class="kw">AS</span> num_persons</span>
-<span id="cb25-23"><a href="materialized-views-1.html#cb25-23" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb25-24"><a href="materialized-views-1.html#cb25-24" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1</span>)) counts <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> counts.data_source_id)))</span>
-<span id="cb25-25"><a href="materialized-views-1.html#cb25-25" aria-hidden="true"></a> <span class="kw">GROUP</span> <span class="kw">BY</span> achilles.analysis_id, <span class="kw">source</span>.name, <span class="kw">source</span>.acronym, <span class="kw">source</span>.database_type, country.country</span>
-<span id="cb25-26"><a href="materialized-views-1.html#cb25-26" aria-hidden="true"></a><span class="kw">HAVING</span> (achilles.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">201</span>):<span class="ch">:bigint</span>, (<span class="dv">401</span>):<span class="ch">:bigint</span>, (<span class="dv">501</span>):<span class="ch">:bigint</span>, (<span class="dv">601</span>):<span class="ch">:bigint</span>, (<span class="dv">701</span>):<span class="ch">:bigint</span>, (<span class="dv">801</span>):<span class="ch">:bigint</span>, (<span class="dv">1801</span>):<span class="ch">:bigint</span>, (<span class="dv">2101</span>):<span class="ch">:bigint</span>, (<span class="dv">2201</span>):<span class="ch">:bigint</span>]));</span></code></pre></div>
+<span id="cb24-5"><a href="materialized-views-1.html#cb24-5" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
+<span id="cb24-6"><a href="materialized-views-1.html#cb24-6" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">201</span>)</span>
+<span id="cb24-7"><a href="materialized-views-1.html#cb24-7" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Visit&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb24-8"><a href="materialized-views-1.html#cb24-8" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">401</span>)</span>
+<span id="cb24-9"><a href="materialized-views-1.html#cb24-9" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb24-10"><a href="materialized-views-1.html#cb24-10" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">501</span>)</span>
+<span id="cb24-11"><a href="materialized-views-1.html#cb24-11" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Death&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb24-12"><a href="materialized-views-1.html#cb24-12" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">601</span>)</span>
+<span id="cb24-13"><a href="materialized-views-1.html#cb24-13" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb24-14"><a href="materialized-views-1.html#cb24-14" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">701</span>)</span>
+<span id="cb24-15"><a href="materialized-views-1.html#cb24-15" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Drug Exposure&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb24-16"><a href="materialized-views-1.html#cb24-16" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">801</span>)</span>
+<span id="cb24-17"><a href="materialized-views-1.html#cb24-17" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb24-18"><a href="materialized-views-1.html#cb24-18" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">1801</span>)</span>
+<span id="cb24-19"><a href="materialized-views-1.html#cb24-19" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb24-20"><a href="materialized-views-1.html#cb24-20" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">2101</span>)</span>
+<span id="cb24-21"><a href="materialized-views-1.html#cb24-21" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb24-22"><a href="materialized-views-1.html#cb24-22" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">2201</span>)</span>
+<span id="cb24-23"><a href="materialized-views-1.html#cb24-23" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Note&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb24-24"><a href="materialized-views-1.html#cb24-24" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:text</span></span>
+<span id="cb24-25"><a href="materialized-views-1.html#cb24-25" aria-hidden="true"></a>       <span class="cf">END</span> <span class="kw">AS</span> data_domain,</span>
+<span id="cb24-26"><a href="materialized-views-1.html#cb24-26" aria-hidden="true"></a>   (<span class="fu">sum</span>(achilles.count_value) <span class="op">/</span> <span class="fu">avg</span>(counts.num_persons))</span>
+<span id="cb24-27"><a href="materialized-views-1.html#cb24-27" aria-hidden="true"></a>     <span class="kw">AS</span> records_per_person</span>
+<span id="cb24-28"><a href="materialized-views-1.html#cb24-28" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results achilles</span>
+<span id="cb24-29"><a href="materialized-views-1.html#cb24-29" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb24-30"><a href="materialized-views-1.html#cb24-30" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
+<span id="cb24-31"><a href="materialized-views-1.html#cb24-31" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
+<span id="cb24-32"><a href="materialized-views-1.html#cb24-32" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.data_source_id,</span>
+<span id="cb24-33"><a href="materialized-views-1.html#cb24-33" aria-hidden="true"></a>           achilles_results.count_value <span class="kw">AS</span> num_persons</span>
+<span id="cb24-34"><a href="materialized-views-1.html#cb24-34" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb24-35"><a href="materialized-views-1.html#cb24-35" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1</span>)) counts</span>
+<span id="cb24-36"><a href="materialized-views-1.html#cb24-36" aria-hidden="true"></a>           <span class="kw">ON</span> achilles.data_source_id <span class="op">=</span> counts.data_source_id)</span>
+<span id="cb24-37"><a href="materialized-views-1.html#cb24-37" aria-hidden="true"></a> <span class="kw">GROUP</span> <span class="kw">BY</span></span>
+<span id="cb24-38"><a href="materialized-views-1.html#cb24-38" aria-hidden="true"></a>   achilles.analysis_id,</span>
+<span id="cb24-39"><a href="materialized-views-1.html#cb24-39" aria-hidden="true"></a>   <span class="kw">source</span>.name,</span>
+<span id="cb24-40"><a href="materialized-views-1.html#cb24-40" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
+<span id="cb24-41"><a href="materialized-views-1.html#cb24-41" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
+<span id="cb24-42"><a href="materialized-views-1.html#cb24-42" aria-hidden="true"></a>   country.country</span>
+<span id="cb24-43"><a href="materialized-views-1.html#cb24-43" aria-hidden="true"></a><span class="kw">HAVING</span></span>
+<span id="cb24-44"><a href="materialized-views-1.html#cb24-44" aria-hidden="true"></a>  (</span>
+<span id="cb24-45"><a href="materialized-views-1.html#cb24-45" aria-hidden="true"></a>    achilles.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb24-46"><a href="materialized-views-1.html#cb24-46" aria-hidden="true"></a>      <span class="dt">ARRAY</span>[(<span class="dv">201</span>):: bigint,</span>
+<span id="cb24-47"><a href="materialized-views-1.html#cb24-47" aria-hidden="true"></a>      (<span class="dv">401</span>):: bigint,</span>
+<span id="cb24-48"><a href="materialized-views-1.html#cb24-48" aria-hidden="true"></a>      (<span class="dv">501</span>):: bigint,</span>
+<span id="cb24-49"><a href="materialized-views-1.html#cb24-49" aria-hidden="true"></a>      (<span class="dv">601</span>):: bigint,</span>
+<span id="cb24-50"><a href="materialized-views-1.html#cb24-50" aria-hidden="true"></a>      (<span class="dv">701</span>):: bigint,</span>
+<span id="cb24-51"><a href="materialized-views-1.html#cb24-51" aria-hidden="true"></a>      (<span class="dv">801</span>):: bigint,</span>
+<span id="cb24-52"><a href="materialized-views-1.html#cb24-52" aria-hidden="true"></a>      (<span class="dv">1801</span>):: bigint,</span>
+<span id="cb24-53"><a href="materialized-views-1.html#cb24-53" aria-hidden="true"></a>      (<span class="dv">2101</span>):: bigint,</span>
+<span id="cb24-54"><a href="materialized-views-1.html#cb24-54" aria-hidden="true"></a>      (<span class="dv">2201</span>):: bigint]</span>
+<span id="cb24-55"><a href="materialized-views-1.html#cb24-55" aria-hidden="true"></a>    )</span>
+<span id="cb24-56"><a href="materialized-views-1.html#cb24-56" aria-hidden="true"></a>  );</span></code></pre></div>
 </div>
 <div id="data_domain_total_num_of_records" class="section level3 unnumbered" number="">
 <h3>data_domain_total_num_of_records</h3>
-<div class="sourceCode" id="cb26"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb26-1"><a href="materialized-views-1.html#cb26-1" aria-hidden="true"></a><span class="kw">SELECT</span> data_source.name,</span>
-<span id="cb26-2"><a href="materialized-views-1.html#cb26-2" aria-hidden="true"></a>   data_source.acronym,</span>
-<span id="cb26-3"><a href="materialized-views-1.html#cb26-3" aria-hidden="true"></a>   data_source.database_type,</span>
-<span id="cb26-4"><a href="materialized-views-1.html#cb26-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb26-5"><a href="materialized-views-1.html#cb26-5" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb26-6"><a href="materialized-views-1.html#cb26-6" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">201</span>) <span class="cf">THEN</span> <span class="st">&#39;Visit&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb26-7"><a href="materialized-views-1.html#cb26-7" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">401</span>) <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb26-8"><a href="materialized-views-1.html#cb26-8" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">501</span>) <span class="cf">THEN</span> <span class="st">&#39;Death&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb26-9"><a href="materialized-views-1.html#cb26-9" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">601</span>) <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb26-10"><a href="materialized-views-1.html#cb26-10" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">701</span>) <span class="cf">THEN</span> <span class="st">&#39;Drug Exposure&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb26-11"><a href="materialized-views-1.html#cb26-11" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">801</span>) <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb26-12"><a href="materialized-views-1.html#cb26-12" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1801</span>) <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb26-13"><a href="materialized-views-1.html#cb26-13" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">2101</span>) <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb26-14"><a href="materialized-views-1.html#cb26-14" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">2201</span>) <span class="cf">THEN</span> <span class="st">&#39;Note&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb26-15"><a href="materialized-views-1.html#cb26-15" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:text</span></span>
-<span id="cb26-16"><a href="materialized-views-1.html#cb26-16" aria-hidden="true"></a>       <span class="cf">END</span> <span class="kw">AS</span> data_domain,</span>
-<span id="cb26-17"><a href="materialized-views-1.html#cb26-17" aria-hidden="true"></a>   <span class="fu">sum</span>(achilles_results.count_value) <span class="kw">AS</span> <span class="fu">count</span></span>
-<span id="cb26-18"><a href="materialized-views-1.html#cb26-18" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results</span>
-<span id="cb26-19"><a href="materialized-views-1.html#cb26-19" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">ON</span> ((achilles_results.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)))</span>
-<span id="cb26-20"><a href="materialized-views-1.html#cb26-20" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> data_source.country_id)))</span>
-<span id="cb26-21"><a href="materialized-views-1.html#cb26-21" aria-hidden="true"></a> <span class="kw">GROUP</span> <span class="kw">BY</span> data_source.name, data_source.acronym, data_source.database_type, country.country, achilles_results.analysis_id</span>
-<span id="cb26-22"><a href="materialized-views-1.html#cb26-22" aria-hidden="true"></a><span class="kw">HAVING</span> (achilles_results.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">201</span>):<span class="ch">:bigint</span>, (<span class="dv">401</span>):<span class="ch">:bigint</span>, (<span class="dv">501</span>):<span class="ch">:bigint</span>, (<span class="dv">601</span>):<span class="ch">:bigint</span>, (<span class="dv">701</span>):<span class="ch">:bigint</span>, (<span class="dv">801</span>):<span class="ch">:bigint</span>, (<span class="dv">1801</span>):<span class="ch">:bigint</span>, (<span class="dv">2101</span>):<span class="ch">:bigint</span>, (<span class="dv">2201</span>):<span class="ch">:bigint</span>]));</span></code></pre></div>
+<div class="sourceCode" id="cb25"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb25-1"><a href="materialized-views-1.html#cb25-1" aria-hidden="true"></a><span class="kw">SELECT</span> data_source.name,</span>
+<span id="cb25-2"><a href="materialized-views-1.html#cb25-2" aria-hidden="true"></a>   data_source.acronym,</span>
+<span id="cb25-3"><a href="materialized-views-1.html#cb25-3" aria-hidden="true"></a>   data_source.database_type,</span>
+<span id="cb25-4"><a href="materialized-views-1.html#cb25-4" aria-hidden="true"></a>   country.country,</span>
+<span id="cb25-5"><a href="materialized-views-1.html#cb25-5" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
+<span id="cb25-6"><a href="materialized-views-1.html#cb25-6" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">201</span>)</span>
+<span id="cb25-7"><a href="materialized-views-1.html#cb25-7" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Visit&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb25-8"><a href="materialized-views-1.html#cb25-8" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">401</span>)</span>
+<span id="cb25-9"><a href="materialized-views-1.html#cb25-9" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb25-10"><a href="materialized-views-1.html#cb25-10" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">501</span>)</span>
+<span id="cb25-11"><a href="materialized-views-1.html#cb25-11" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Death&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb25-12"><a href="materialized-views-1.html#cb25-12" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">601</span>)</span>
+<span id="cb25-13"><a href="materialized-views-1.html#cb25-13" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb25-14"><a href="materialized-views-1.html#cb25-14" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">701</span>)</span>
+<span id="cb25-15"><a href="materialized-views-1.html#cb25-15" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Drug Exposure&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb25-16"><a href="materialized-views-1.html#cb25-16" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">801</span>)</span>
+<span id="cb25-17"><a href="materialized-views-1.html#cb25-17" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb25-18"><a href="materialized-views-1.html#cb25-18" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1801</span>)</span>
+<span id="cb25-19"><a href="materialized-views-1.html#cb25-19" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb25-20"><a href="materialized-views-1.html#cb25-20" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">2101</span>)</span>
+<span id="cb25-21"><a href="materialized-views-1.html#cb25-21" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb25-22"><a href="materialized-views-1.html#cb25-22" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">2201</span>)</span>
+<span id="cb25-23"><a href="materialized-views-1.html#cb25-23" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Note&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb25-24"><a href="materialized-views-1.html#cb25-24" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:text</span></span>
+<span id="cb25-25"><a href="materialized-views-1.html#cb25-25" aria-hidden="true"></a>       <span class="cf">END</span> <span class="kw">AS</span> data_domain,</span>
+<span id="cb25-26"><a href="materialized-views-1.html#cb25-26" aria-hidden="true"></a>   <span class="fu">sum</span>(achilles_results.count_value) <span class="kw">AS</span> <span class="fu">count</span></span>
+<span id="cb25-27"><a href="materialized-views-1.html#cb25-27" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results</span>
+<span id="cb25-28"><a href="materialized-views-1.html#cb25-28" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source</span>
+<span id="cb25-29"><a href="materialized-views-1.html#cb25-29" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles_results.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)))</span>
+<span id="cb25-30"><a href="materialized-views-1.html#cb25-30" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> data_source.country_id)))</span>
+<span id="cb25-31"><a href="materialized-views-1.html#cb25-31" aria-hidden="true"></a> <span class="kw">GROUP</span> <span class="kw">BY</span></span>
+<span id="cb25-32"><a href="materialized-views-1.html#cb25-32" aria-hidden="true"></a>   data_source.name,</span>
+<span id="cb25-33"><a href="materialized-views-1.html#cb25-33" aria-hidden="true"></a>   data_source.acronym,</span>
+<span id="cb25-34"><a href="materialized-views-1.html#cb25-34" aria-hidden="true"></a>   data_source.database_type,</span>
+<span id="cb25-35"><a href="materialized-views-1.html#cb25-35" aria-hidden="true"></a>   country.country,</span>
+<span id="cb25-36"><a href="materialized-views-1.html#cb25-36" aria-hidden="true"></a>   achilles_results.analysis_id</span>
+<span id="cb25-37"><a href="materialized-views-1.html#cb25-37" aria-hidden="true"></a><span class="kw">HAVING</span></span>
+<span id="cb25-38"><a href="materialized-views-1.html#cb25-38" aria-hidden="true"></a>  (</span>
+<span id="cb25-39"><a href="materialized-views-1.html#cb25-39" aria-hidden="true"></a>    achilles_results.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb25-40"><a href="materialized-views-1.html#cb25-40" aria-hidden="true"></a>      <span class="dt">ARRAY</span>[(<span class="dv">201</span>):: bigint,</span>
+<span id="cb25-41"><a href="materialized-views-1.html#cb25-41" aria-hidden="true"></a>      (<span class="dv">401</span>):: bigint,</span>
+<span id="cb25-42"><a href="materialized-views-1.html#cb25-42" aria-hidden="true"></a>      (<span class="dv">501</span>):: bigint,</span>
+<span id="cb25-43"><a href="materialized-views-1.html#cb25-43" aria-hidden="true"></a>      (<span class="dv">601</span>):: bigint,</span>
+<span id="cb25-44"><a href="materialized-views-1.html#cb25-44" aria-hidden="true"></a>      (<span class="dv">701</span>):: bigint,</span>
+<span id="cb25-45"><a href="materialized-views-1.html#cb25-45" aria-hidden="true"></a>      (<span class="dv">801</span>):: bigint,</span>
+<span id="cb25-46"><a href="materialized-views-1.html#cb25-46" aria-hidden="true"></a>      (<span class="dv">1801</span>):: bigint,</span>
+<span id="cb25-47"><a href="materialized-views-1.html#cb25-47" aria-hidden="true"></a>      (<span class="dv">2101</span>):: bigint,</span>
+<span id="cb25-48"><a href="materialized-views-1.html#cb25-48" aria-hidden="true"></a>      (<span class="dv">2201</span>):: bigint]</span>
+<span id="cb25-49"><a href="materialized-views-1.html#cb25-49" aria-hidden="true"></a>    )</span>
+<span id="cb25-50"><a href="materialized-views-1.html#cb25-50" aria-hidden="true"></a>  );</span></code></pre></div>
 </div>
 <div id="number_of_distinct_per_person" class="section level3 unnumbered" number="">
 <h3>number_of_distinct_per_person</h3>
+<div class="sourceCode" id="cb26"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb26-1"><a href="materialized-views-1.html#cb26-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb26-2"><a href="materialized-views-1.html#cb26-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
+<span id="cb26-3"><a href="materialized-views-1.html#cb26-3" aria-hidden="true"></a>   country.country,</span>
+<span id="cb26-4"><a href="materialized-views-1.html#cb26-4" aria-hidden="true"></a>   achilles.analysis_id,</span>
+<span id="cb26-5"><a href="materialized-views-1.html#cb26-5" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
+<span id="cb26-6"><a href="materialized-views-1.html#cb26-6" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">203</span>)</span>
+<span id="cb26-7"><a href="materialized-views-1.html#cb26-7" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Visit&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb26-8"><a href="materialized-views-1.html#cb26-8" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">403</span>)</span>
+<span id="cb26-9"><a href="materialized-views-1.html#cb26-9" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb26-10"><a href="materialized-views-1.html#cb26-10" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">603</span>)</span>
+<span id="cb26-11"><a href="materialized-views-1.html#cb26-11" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb26-12"><a href="materialized-views-1.html#cb26-12" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">703</span>)</span>
+<span id="cb26-13"><a href="materialized-views-1.html#cb26-13" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Drug Exposure&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb26-14"><a href="materialized-views-1.html#cb26-14" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">803</span>)</span>
+<span id="cb26-15"><a href="materialized-views-1.html#cb26-15" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb26-16"><a href="materialized-views-1.html#cb26-16" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">1803</span>)</span>
+<span id="cb26-17"><a href="materialized-views-1.html#cb26-17" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb26-18"><a href="materialized-views-1.html#cb26-18" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:text</span></span>
+<span id="cb26-19"><a href="materialized-views-1.html#cb26-19" aria-hidden="true"></a>       <span class="cf">END</span> <span class="kw">AS</span> data_domain,</span>
+<span id="cb26-20"><a href="materialized-views-1.html#cb26-20" aria-hidden="true"></a>   achilles.count_value,</span>
+<span id="cb26-21"><a href="materialized-views-1.html#cb26-21" aria-hidden="true"></a>   achilles.min_value,</span>
+<span id="cb26-22"><a href="materialized-views-1.html#cb26-22" aria-hidden="true"></a>   achilles.p10_value <span class="kw">AS</span> p10,</span>
+<span id="cb26-23"><a href="materialized-views-1.html#cb26-23" aria-hidden="true"></a>   achilles.p25_value <span class="kw">AS</span> p25,</span>
+<span id="cb26-24"><a href="materialized-views-1.html#cb26-24" aria-hidden="true"></a>   achilles.median_value <span class="kw">AS</span> <span class="fu">median</span>,</span>
+<span id="cb26-25"><a href="materialized-views-1.html#cb26-25" aria-hidden="true"></a>   achilles.p75_value <span class="kw">AS</span> p75,</span>
+<span id="cb26-26"><a href="materialized-views-1.html#cb26-26" aria-hidden="true"></a>   achilles.p90_value <span class="kw">AS</span> p90,</span>
+<span id="cb26-27"><a href="materialized-views-1.html#cb26-27" aria-hidden="true"></a>   achilles.max_value</span>
+<span id="cb26-28"><a href="materialized-views-1.html#cb26-28" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
+<span id="cb26-29"><a href="materialized-views-1.html#cb26-29" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb26-30"><a href="materialized-views-1.html#cb26-30" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
+<span id="cb26-31"><a href="materialized-views-1.html#cb26-31" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((<span class="kw">source</span>.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
+<span id="cb26-32"><a href="materialized-views-1.html#cb26-32" aria-hidden="true"></a> <span class="kw">WHERE</span></span>
+<span id="cb26-33"><a href="materialized-views-1.html#cb26-33" aria-hidden="true"></a>   (</span>
+<span id="cb26-34"><a href="materialized-views-1.html#cb26-34" aria-hidden="true"></a>     achilles.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb26-35"><a href="materialized-views-1.html#cb26-35" aria-hidden="true"></a>       <span class="dt">ARRAY</span>[(<span class="dv">203</span>):: bigint,</span>
+<span id="cb26-36"><a href="materialized-views-1.html#cb26-36" aria-hidden="true"></a>       (<span class="dv">403</span>):: bigint,</span>
+<span id="cb26-37"><a href="materialized-views-1.html#cb26-37" aria-hidden="true"></a>       (<span class="dv">603</span>):: bigint,</span>
+<span id="cb26-38"><a href="materialized-views-1.html#cb26-38" aria-hidden="true"></a>       (<span class="dv">703</span>):: bigint,</span>
+<span id="cb26-39"><a href="materialized-views-1.html#cb26-39" aria-hidden="true"></a>       (<span class="dv">803</span>):: bigint,</span>
+<span id="cb26-40"><a href="materialized-views-1.html#cb26-40" aria-hidden="true"></a>       (<span class="dv">183</span>):: bigint]</span>
+<span id="cb26-41"><a href="materialized-views-1.html#cb26-41" aria-hidden="true"></a>     )</span>
+<span id="cb26-42"><a href="materialized-views-1.html#cb26-42" aria-hidden="true"></a>   )</span>
+<span id="cb26-43"><a href="materialized-views-1.html#cb26-43" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> <span class="kw">source</span>.name;</span></code></pre></div>
+</div>
+<div id="data_provenance" class="section level3 unnumbered" number="">
+<h3>data_provenance</h3>
 <div class="sourceCode" id="cb27"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb27-1"><a href="materialized-views-1.html#cb27-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
 <span id="cb27-2"><a href="materialized-views-1.html#cb27-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb27-3"><a href="materialized-views-1.html#cb27-3" aria-hidden="true"></a>   country.country,</span>
-<span id="cb27-4"><a href="materialized-views-1.html#cb27-4" aria-hidden="true"></a>   achilles.analysis_id,</span>
+<span id="cb27-3"><a href="materialized-views-1.html#cb27-3" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
+<span id="cb27-4"><a href="materialized-views-1.html#cb27-4" aria-hidden="true"></a>   country.country,</span>
 <span id="cb27-5"><a href="materialized-views-1.html#cb27-5" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb27-6"><a href="materialized-views-1.html#cb27-6" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">203</span>) <span class="cf">THEN</span> <span class="st">&#39;Visit&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb27-7"><a href="materialized-views-1.html#cb27-7" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">403</span>) <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb27-8"><a href="materialized-views-1.html#cb27-8" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">603</span>) <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb27-9"><a href="materialized-views-1.html#cb27-9" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">703</span>) <span class="cf">THEN</span> <span class="st">&#39;Drug Exposure&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb27-10"><a href="materialized-views-1.html#cb27-10" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">803</span>) <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb27-11"><a href="materialized-views-1.html#cb27-11" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">1803</span>) <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb27-12"><a href="materialized-views-1.html#cb27-12" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:text</span></span>
-<span id="cb27-13"><a href="materialized-views-1.html#cb27-13" aria-hidden="true"></a>       <span class="cf">END</span> <span class="kw">AS</span> data_domain,</span>
-<span id="cb27-14"><a href="materialized-views-1.html#cb27-14" aria-hidden="true"></a>   achilles.count_value,</span>
-<span id="cb27-15"><a href="materialized-views-1.html#cb27-15" aria-hidden="true"></a>   achilles.min_value,</span>
-<span id="cb27-16"><a href="materialized-views-1.html#cb27-16" aria-hidden="true"></a>   achilles.p10_value <span class="kw">AS</span> p10,</span>
-<span id="cb27-17"><a href="materialized-views-1.html#cb27-17" aria-hidden="true"></a>   achilles.p25_value <span class="kw">AS</span> p25,</span>
-<span id="cb27-18"><a href="materialized-views-1.html#cb27-18" aria-hidden="true"></a>   achilles.median_value <span class="kw">AS</span> <span class="fu">median</span>,</span>
-<span id="cb27-19"><a href="materialized-views-1.html#cb27-19" aria-hidden="true"></a>   achilles.p75_value <span class="kw">AS</span> p75,</span>
-<span id="cb27-20"><a href="materialized-views-1.html#cb27-20" aria-hidden="true"></a>   achilles.p90_value <span class="kw">AS</span> p90,</span>
-<span id="cb27-21"><a href="materialized-views-1.html#cb27-21" aria-hidden="true"></a>   achilles.max_value</span>
-<span id="cb27-22"><a href="materialized-views-1.html#cb27-22" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
-<span id="cb27-23"><a href="materialized-views-1.html#cb27-23" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb27-24"><a href="materialized-views-1.html#cb27-24" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((<span class="kw">source</span>.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
-<span id="cb27-25"><a href="materialized-views-1.html#cb27-25" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">203</span>):<span class="ch">:bigint</span>, (<span class="dv">403</span>):<span class="ch">:bigint</span>, (<span class="dv">603</span>):<span class="ch">:bigint</span>, (<span class="dv">703</span>):<span class="ch">:bigint</span>, (<span class="dv">803</span>):<span class="ch">:bigint</span>, (<span class="dv">183</span>):<span class="ch">:bigint</span>]))</span>
-<span id="cb27-26"><a href="materialized-views-1.html#cb27-26" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> <span class="kw">source</span>.name;</span></code></pre></div>
+<span id="cb27-6"><a href="materialized-views-1.html#cb27-6" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">405</span>)</span>
+<span id="cb27-7"><a href="materialized-views-1.html#cb27-7" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-8"><a href="materialized-views-1.html#cb27-8" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">605</span>)</span>
+<span id="cb27-9"><a href="materialized-views-1.html#cb27-9" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-10"><a href="materialized-views-1.html#cb27-10" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">705</span>)</span>
+<span id="cb27-11"><a href="materialized-views-1.html#cb27-11" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Drug&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-12"><a href="materialized-views-1.html#cb27-12" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">805</span>)</span>
+<span id="cb27-13"><a href="materialized-views-1.html#cb27-13" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-14"><a href="materialized-views-1.html#cb27-14" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">1805</span>)</span>
+<span id="cb27-15"><a href="materialized-views-1.html#cb27-15" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-16"><a href="materialized-views-1.html#cb27-16" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">2105</span>)</span>
+<span id="cb27-17"><a href="materialized-views-1.html#cb27-17" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-18"><a href="materialized-views-1.html#cb27-18" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="st">&#39;Other&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-19"><a href="materialized-views-1.html#cb27-19" aria-hidden="true"></a>       <span class="cf">END</span> <span class="kw">AS</span> domain_name,</span>
+<span id="cb27-20"><a href="materialized-views-1.html#cb27-20" aria-hidden="true"></a>   c1.concept_name,</span>
+<span id="cb27-21"><a href="materialized-views-1.html#cb27-21" aria-hidden="true"></a>   <span class="fu">sum</span>(achilles.count_value) <span class="kw">AS</span> num_records</span>
+<span id="cb27-22"><a href="materialized-views-1.html#cb27-22" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results achilles</span>
+<span id="cb27-23"><a href="materialized-views-1.html#cb27-23" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb27-24"><a href="materialized-views-1.html#cb27-24" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
+<span id="cb27-25"><a href="materialized-views-1.html#cb27-25" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
+<span id="cb27-26"><a href="materialized-views-1.html#cb27-26" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept c1</span>
+<span id="cb27-27"><a href="materialized-views-1.html#cb27-27" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.stratum_2 <span class="op">=</span> (c1.concept_id):<span class="ch">:text</span>)))</span>
+<span id="cb27-28"><a href="materialized-views-1.html#cb27-28" aria-hidden="true"></a> <span class="kw">WHERE</span></span>
+<span id="cb27-29"><a href="materialized-views-1.html#cb27-29" aria-hidden="true"></a>   (</span>
+<span id="cb27-30"><a href="materialized-views-1.html#cb27-30" aria-hidden="true"></a>     achilles.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb27-31"><a href="materialized-views-1.html#cb27-31" aria-hidden="true"></a>       <span class="dt">ARRAY</span>[(<span class="dv">405</span>):: bigint,</span>
+<span id="cb27-32"><a href="materialized-views-1.html#cb27-32" aria-hidden="true"></a>       (<span class="dv">605</span>):: bigint,</span>
+<span id="cb27-33"><a href="materialized-views-1.html#cb27-33" aria-hidden="true"></a>       (<span class="dv">705</span>):: bigint,</span>
+<span id="cb27-34"><a href="materialized-views-1.html#cb27-34" aria-hidden="true"></a>       (<span class="dv">805</span>):: bigint,</span>
+<span id="cb27-35"><a href="materialized-views-1.html#cb27-35" aria-hidden="true"></a>       (<span class="dv">1805</span>):: bigint,</span>
+<span id="cb27-36"><a href="materialized-views-1.html#cb27-36" aria-hidden="true"></a>       (<span class="dv">2105</span>):: bigint]</span>
+<span id="cb27-37"><a href="materialized-views-1.html#cb27-37" aria-hidden="true"></a>     )</span>
+<span id="cb27-38"><a href="materialized-views-1.html#cb27-38" aria-hidden="true"></a>   )</span>
+<span id="cb27-39"><a href="materialized-views-1.html#cb27-39" aria-hidden="true"></a> <span class="kw">GROUP</span> <span class="kw">BY</span></span>
+<span id="cb27-40"><a href="materialized-views-1.html#cb27-40" aria-hidden="true"></a>   <span class="kw">source</span>.name,</span>
+<span id="cb27-41"><a href="materialized-views-1.html#cb27-41" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
+<span id="cb27-42"><a href="materialized-views-1.html#cb27-42" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
+<span id="cb27-43"><a href="materialized-views-1.html#cb27-43" aria-hidden="true"></a>   country.country,</span>
+<span id="cb27-44"><a href="materialized-views-1.html#cb27-44" aria-hidden="true"></a>   c1.concept_name,</span>
+<span id="cb27-45"><a href="materialized-views-1.html#cb27-45" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
+<span id="cb27-46"><a href="materialized-views-1.html#cb27-46" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">405</span>)</span>
+<span id="cb27-47"><a href="materialized-views-1.html#cb27-47" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-48"><a href="materialized-views-1.html#cb27-48" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">605</span>)</span>
+<span id="cb27-49"><a href="materialized-views-1.html#cb27-49" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-50"><a href="materialized-views-1.html#cb27-50" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">705</span>)</span>
+<span id="cb27-51"><a href="materialized-views-1.html#cb27-51" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Drug&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-52"><a href="materialized-views-1.html#cb27-52" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">805</span>)</span>
+<span id="cb27-53"><a href="materialized-views-1.html#cb27-53" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-54"><a href="materialized-views-1.html#cb27-54" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">1805</span>)</span>
+<span id="cb27-55"><a href="materialized-views-1.html#cb27-55" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-56"><a href="materialized-views-1.html#cb27-56" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">2105</span>)</span>
+<span id="cb27-57"><a href="materialized-views-1.html#cb27-57" aria-hidden="true"></a>             <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-58"><a href="materialized-views-1.html#cb27-58" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="st">&#39;Other&#39;</span>:<span class="ch">:text</span></span>
+<span id="cb27-59"><a href="materialized-views-1.html#cb27-59" aria-hidden="true"></a>       <span class="cf">END</span>;</span></code></pre></div>
 </div>
-<div id="data_provenance" class="section level3 unnumbered" number="">
-<h3>data_provenance</h3>
+<div id="num_of_patients_in_observation_period" class="section level3 unnumbered" number="">
+<h3>num_of_patients_in_observation_period</h3>
 <div class="sourceCode" id="cb28"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb28-1"><a href="materialized-views-1.html#cb28-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
 <span id="cb28-2"><a href="materialized-views-1.html#cb28-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
 <span id="cb28-3"><a href="materialized-views-1.html#cb28-3" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
 <span id="cb28-4"><a href="materialized-views-1.html#cb28-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb28-5"><a href="materialized-views-1.html#cb28-5" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb28-6"><a href="materialized-views-1.html#cb28-6" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">405</span>) <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-7"><a href="materialized-views-1.html#cb28-7" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">605</span>) <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-8"><a href="materialized-views-1.html#cb28-8" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">705</span>) <span class="cf">THEN</span> <span class="st">&#39;Drug&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-9"><a href="materialized-views-1.html#cb28-9" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">805</span>) <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-10"><a href="materialized-views-1.html#cb28-10" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">1805</span>) <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-11"><a href="materialized-views-1.html#cb28-11" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">2105</span>) <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-12"><a href="materialized-views-1.html#cb28-12" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="st">&#39;Other&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-13"><a href="materialized-views-1.html#cb28-13" aria-hidden="true"></a>       <span class="cf">END</span> <span class="kw">AS</span> domain_name,</span>
-<span id="cb28-14"><a href="materialized-views-1.html#cb28-14" aria-hidden="true"></a>   c1.concept_name,</span>
-<span id="cb28-15"><a href="materialized-views-1.html#cb28-15" aria-hidden="true"></a>   <span class="fu">sum</span>(achilles.count_value) <span class="kw">AS</span> num_records</span>
-<span id="cb28-16"><a href="materialized-views-1.html#cb28-16" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results achilles</span>
-<span id="cb28-17"><a href="materialized-views-1.html#cb28-17" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb28-18"><a href="materialized-views-1.html#cb28-18" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
-<span id="cb28-19"><a href="materialized-views-1.html#cb28-19" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept c1 <span class="kw">ON</span> ((achilles.stratum_2 <span class="op">=</span> (c1.concept_id):<span class="ch">:text</span>)))</span>
-<span id="cb28-20"><a href="materialized-views-1.html#cb28-20" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">405</span>):<span class="ch">:bigint</span>, (<span class="dv">605</span>):<span class="ch">:bigint</span>, (<span class="dv">705</span>):<span class="ch">:bigint</span>, (<span class="dv">805</span>):<span class="ch">:bigint</span>, (<span class="dv">1805</span>):<span class="ch">:bigint</span>, (<span class="dv">2105</span>):<span class="ch">:bigint</span>]))</span>
-<span id="cb28-21"><a href="materialized-views-1.html#cb28-21" aria-hidden="true"></a> <span class="kw">GROUP</span> <span class="kw">BY</span> <span class="kw">source</span>.name, <span class="kw">source</span>.acronym, <span class="kw">source</span>.database_type, country.country, c1.concept_name,</span>
-<span id="cb28-22"><a href="materialized-views-1.html#cb28-22" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb28-23"><a href="materialized-views-1.html#cb28-23" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">405</span>) <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-24"><a href="materialized-views-1.html#cb28-24" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">605</span>) <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-25"><a href="materialized-views-1.html#cb28-25" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">705</span>) <span class="cf">THEN</span> <span class="st">&#39;Drug&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-26"><a href="materialized-views-1.html#cb28-26" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">805</span>) <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-27"><a href="materialized-views-1.html#cb28-27" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">1805</span>) <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-28"><a href="materialized-views-1.html#cb28-28" aria-hidden="true"></a>           <span class="cf">WHEN</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">2105</span>) <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-29"><a href="materialized-views-1.html#cb28-29" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="st">&#39;Other&#39;</span>:<span class="ch">:text</span></span>
-<span id="cb28-30"><a href="materialized-views-1.html#cb28-30" aria-hidden="true"></a>       <span class="cf">END</span>;</span></code></pre></div>
-</div>
-<div id="num_of_patients_in_observation_period" class="section level3 unnumbered" number="">
-<h3>num_of_patients_in_observation_period</h3>
-<div class="sourceCode" id="cb29"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb29-1"><a href="materialized-views-1.html#cb29-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb29-2"><a href="materialized-views-1.html#cb29-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb29-3"><a href="materialized-views-1.html#cb29-3" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
-<span id="cb29-4"><a href="materialized-views-1.html#cb29-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb29-5"><a href="materialized-views-1.html#cb29-5" aria-hidden="true"></a>   <span class="fu">to_date</span>(achilles.stratum_1, <span class="st">&#39;YYYYMM&#39;</span>:<span class="ch">:text</span>) <span class="kw">AS</span> <span class="dt">date</span>,</span>
-<span id="cb29-6"><a href="materialized-views-1.html#cb29-6" aria-hidden="true"></a>   achilles.count_value <span class="kw">AS</span> <span class="ot">&quot;Nr_patients&quot;</span></span>
-<span id="cb29-7"><a href="materialized-views-1.html#cb29-7" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
-<span id="cb29-8"><a href="materialized-views-1.html#cb29-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb29-9"><a href="materialized-views-1.html#cb29-9" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
-<span id="cb29-10"><a href="materialized-views-1.html#cb29-10" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">110</span>);</span></code></pre></div>
+<span id="cb28-5"><a href="materialized-views-1.html#cb28-5" aria-hidden="true"></a>   <span class="fu">to_date</span>(achilles.stratum_1, <span class="st">&#39;YYYYMM&#39;</span>:<span class="ch">:text</span>) <span class="kw">AS</span> <span class="dt">date</span>,</span>
+<span id="cb28-6"><a href="materialized-views-1.html#cb28-6" aria-hidden="true"></a>   achilles.count_value <span class="kw">AS</span> <span class="ot">&quot;Nr_patients&quot;</span></span>
+<span id="cb28-7"><a href="materialized-views-1.html#cb28-7" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
+<span id="cb28-8"><a href="materialized-views-1.html#cb28-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb28-9"><a href="materialized-views-1.html#cb28-9" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
+<span id="cb28-10"><a href="materialized-views-1.html#cb28-10" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
+<span id="cb28-11"><a href="materialized-views-1.html#cb28-11" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">110</span>);</span></code></pre></div>
 </div>
 <div id="cumulative_observation_time" class="section level3 unnumbered" number="">
 <h3>cumulative_observation_time</h3>
-<div class="sourceCode" id="cb30"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb30-1"><a href="materialized-views-1.html#cb30-1" aria-hidden="true"></a><span class="kw">SELECT</span> data_source.name,</span>
-<span id="cb30-2"><a href="materialized-views-1.html#cb30-2" aria-hidden="true"></a>   data_source.acronym,</span>
-<span id="cb30-3"><a href="materialized-views-1.html#cb30-3" aria-hidden="true"></a>   data_source.database_type,</span>
-<span id="cb30-4"><a href="materialized-views-1.html#cb30-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb30-5"><a href="materialized-views-1.html#cb30-5" aria-hidden="true"></a>   cumulative_sums.xlengthofobservation,</span>
-<span id="cb30-6"><a href="materialized-views-1.html#cb30-6" aria-hidden="true"></a>   <span class="fu">round</span>((cumulative_sums.cumulative_sum <span class="op">/</span> (totals.total):<span class="ch">:numeric</span>), <span class="dv">5</span>) <span class="kw">AS</span> ypercentpersons</span>
-<span id="cb30-7"><a href="materialized-views-1.html#cb30-7" aria-hidden="true"></a>  <span class="kw">FROM</span> (((( <span class="kw">SELECT</span> achilles_results.data_source_id,</span>
-<span id="cb30-8"><a href="materialized-views-1.html#cb30-8" aria-hidden="true"></a>           ((achilles_results.stratum_1):<span class="ch">:integer</span> <span class="op">*</span> <span class="dv">30</span>) <span class="kw">AS</span> xlengthofobservation,</span>
-<span id="cb30-9"><a href="materialized-views-1.html#cb30-9" aria-hidden="true"></a>           <span class="fu">sum</span>(achilles_results.count_value) <span class="kw">OVER</span> (<span class="kw">PARTITION</span> <span class="kw">BY</span> achilles_results.data_source_id <span class="kw">ORDER</span> <span class="kw">BY</span> (achilles_results.stratum_1):<span class="ch">:integer</span> <span class="kw">DESC</span>) <span class="kw">AS</span> cumulative_sum</span>
-<span id="cb30-10"><a href="materialized-views-1.html#cb30-10" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb30-11"><a href="materialized-views-1.html#cb30-11" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">108</span>)) cumulative_sums</span>
-<span id="cb30-12"><a href="materialized-views-1.html#cb30-12" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.data_source_id,</span>
-<span id="cb30-13"><a href="materialized-views-1.html#cb30-13" aria-hidden="true"></a>           achilles_results.count_value <span class="kw">AS</span> total</span>
-<span id="cb30-14"><a href="materialized-views-1.html#cb30-14" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb30-15"><a href="materialized-views-1.html#cb30-15" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1</span>)) totals <span class="kw">ON</span> ((cumulative_sums.data_source_id <span class="op">=</span> totals.data_source_id)))</span>
-<span id="cb30-16"><a href="materialized-views-1.html#cb30-16" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">ON</span> ((cumulative_sums.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)))</span>
-<span id="cb30-17"><a href="materialized-views-1.html#cb30-17" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> data_source.country_id)))</span>
-<span id="cb30-18"><a href="materialized-views-1.html#cb30-18" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> data_source.name, cumulative_sums.xlengthofobservation;</span></code></pre></div>
+<div class="sourceCode" id="cb29"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb29-1"><a href="materialized-views-1.html#cb29-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
+<span id="cb29-2"><a href="materialized-views-1.html#cb29-2" aria-hidden="true"></a>  data_source.name,</span>
+<span id="cb29-3"><a href="materialized-views-1.html#cb29-3" aria-hidden="true"></a>  data_source.acronym,</span>
+<span id="cb29-4"><a href="materialized-views-1.html#cb29-4" aria-hidden="true"></a>  data_source.database_type,</span>
+<span id="cb29-5"><a href="materialized-views-1.html#cb29-5" aria-hidden="true"></a>  country.country,</span>
+<span id="cb29-6"><a href="materialized-views-1.html#cb29-6" aria-hidden="true"></a>  cumulative_sums.xlengthofobservation,</span>
+<span id="cb29-7"><a href="materialized-views-1.html#cb29-7" aria-hidden="true"></a>  <span class="fu">round</span>(</span>
+<span id="cb29-8"><a href="materialized-views-1.html#cb29-8" aria-hidden="true"></a>    (cumulative_sums.cumulative_sum <span class="op">/</span> (totals.total):: <span class="dt">numeric</span>),</span>
+<span id="cb29-9"><a href="materialized-views-1.html#cb29-9" aria-hidden="true"></a>    <span class="dv">5</span></span>
+<span id="cb29-10"><a href="materialized-views-1.html#cb29-10" aria-hidden="true"></a>  ) <span class="kw">AS</span> ypercentpersons</span>
+<span id="cb29-11"><a href="materialized-views-1.html#cb29-11" aria-hidden="true"></a><span class="kw">FROM</span></span>
+<span id="cb29-12"><a href="materialized-views-1.html#cb29-12" aria-hidden="true"></a>  (</span>
+<span id="cb29-13"><a href="materialized-views-1.html#cb29-13" aria-hidden="true"></a>    (</span>
+<span id="cb29-14"><a href="materialized-views-1.html#cb29-14" aria-hidden="true"></a>      (</span>
+<span id="cb29-15"><a href="materialized-views-1.html#cb29-15" aria-hidden="true"></a>        (</span>
+<span id="cb29-16"><a href="materialized-views-1.html#cb29-16" aria-hidden="true"></a>          <span class="kw">SELECT</span></span>
+<span id="cb29-17"><a href="materialized-views-1.html#cb29-17" aria-hidden="true"></a>            achilles_results.data_source_id,</span>
+<span id="cb29-18"><a href="materialized-views-1.html#cb29-18" aria-hidden="true"></a>            (</span>
+<span id="cb29-19"><a href="materialized-views-1.html#cb29-19" aria-hidden="true"></a>              (achilles_results.stratum_1):: <span class="dt">integer</span> <span class="op">*</span> <span class="dv">30</span></span>
+<span id="cb29-20"><a href="materialized-views-1.html#cb29-20" aria-hidden="true"></a>            ) <span class="kw">AS</span> xlengthofobservation,</span>
+<span id="cb29-21"><a href="materialized-views-1.html#cb29-21" aria-hidden="true"></a>            <span class="fu">sum</span>(achilles_results.count_value) <span class="kw">OVER</span> (</span>
+<span id="cb29-22"><a href="materialized-views-1.html#cb29-22" aria-hidden="true"></a>              <span class="kw">PARTITION</span> <span class="kw">BY</span> achilles_results.data_source_id</span>
+<span id="cb29-23"><a href="materialized-views-1.html#cb29-23" aria-hidden="true"></a>              <span class="kw">ORDER</span> <span class="kw">BY</span></span>
+<span id="cb29-24"><a href="materialized-views-1.html#cb29-24" aria-hidden="true"></a>                (achilles_results.stratum_1):: <span class="dt">integer</span> <span class="kw">DESC</span></span>
+<span id="cb29-25"><a href="materialized-views-1.html#cb29-25" aria-hidden="true"></a>            ) <span class="kw">AS</span> cumulative_sum</span>
+<span id="cb29-26"><a href="materialized-views-1.html#cb29-26" aria-hidden="true"></a>          <span class="kw">FROM</span></span>
+<span id="cb29-27"><a href="materialized-views-1.html#cb29-27" aria-hidden="true"></a>            achilles_results</span>
+<span id="cb29-28"><a href="materialized-views-1.html#cb29-28" aria-hidden="true"></a>          <span class="kw">WHERE</span></span>
+<span id="cb29-29"><a href="materialized-views-1.html#cb29-29" aria-hidden="true"></a>            (</span>
+<span id="cb29-30"><a href="materialized-views-1.html#cb29-30" aria-hidden="true"></a>              achilles_results.analysis_id <span class="op">=</span> <span class="dv">108</span></span>
+<span id="cb29-31"><a href="materialized-views-1.html#cb29-31" aria-hidden="true"></a>            )</span>
+<span id="cb29-32"><a href="materialized-views-1.html#cb29-32" aria-hidden="true"></a>        ) cumulative_sums</span>
+<span id="cb29-33"><a href="materialized-views-1.html#cb29-33" aria-hidden="true"></a>        <span class="kw">JOIN</span> (</span>
+<span id="cb29-34"><a href="materialized-views-1.html#cb29-34" aria-hidden="true"></a>          <span class="kw">SELECT</span></span>
+<span id="cb29-35"><a href="materialized-views-1.html#cb29-35" aria-hidden="true"></a>            achilles_results.data_source_id,</span>
+<span id="cb29-36"><a href="materialized-views-1.html#cb29-36" aria-hidden="true"></a>            achilles_results.count_value <span class="kw">AS</span> total</span>
+<span id="cb29-37"><a href="materialized-views-1.html#cb29-37" aria-hidden="true"></a>          <span class="kw">FROM</span></span>
+<span id="cb29-38"><a href="materialized-views-1.html#cb29-38" aria-hidden="true"></a>            achilles_results</span>
+<span id="cb29-39"><a href="materialized-views-1.html#cb29-39" aria-hidden="true"></a>          <span class="kw">WHERE</span></span>
+<span id="cb29-40"><a href="materialized-views-1.html#cb29-40" aria-hidden="true"></a>            (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1</span>)</span>
+<span id="cb29-41"><a href="materialized-views-1.html#cb29-41" aria-hidden="true"></a>        ) totals <span class="kw">ON</span> (</span>
+<span id="cb29-42"><a href="materialized-views-1.html#cb29-42" aria-hidden="true"></a>          (</span>
+<span id="cb29-43"><a href="materialized-views-1.html#cb29-43" aria-hidden="true"></a>            cumulative_sums.data_source_id <span class="op">=</span> totals.data_source_id</span>
+<span id="cb29-44"><a href="materialized-views-1.html#cb29-44" aria-hidden="true"></a>          )</span>
+<span id="cb29-45"><a href="materialized-views-1.html#cb29-45" aria-hidden="true"></a>        )</span>
+<span id="cb29-46"><a href="materialized-views-1.html#cb29-46" aria-hidden="true"></a>      )</span>
+<span id="cb29-47"><a href="materialized-views-1.html#cb29-47" aria-hidden="true"></a>      <span class="kw">JOIN</span> data_source</span>
+<span id="cb29-48"><a href="materialized-views-1.html#cb29-48" aria-hidden="true"></a>        <span class="kw">ON</span> ((cumulative_sums.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>))</span>
+<span id="cb29-49"><a href="materialized-views-1.html#cb29-49" aria-hidden="true"></a>    )</span>
+<span id="cb29-50"><a href="materialized-views-1.html#cb29-50" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> data_source.country_id))</span>
+<span id="cb29-51"><a href="materialized-views-1.html#cb29-51" aria-hidden="true"></a>  )</span>
+<span id="cb29-52"><a href="materialized-views-1.html#cb29-52" aria-hidden="true"></a><span class="kw">ORDER</span> <span class="kw">BY</span></span>
+<span id="cb29-53"><a href="materialized-views-1.html#cb29-53" aria-hidden="true"></a>  data_source.name,</span>
+<span id="cb29-54"><a href="materialized-views-1.html#cb29-54" aria-hidden="true"></a>  cumulative_sums.xlengthofobservation;</span></code></pre></div>
 </div>
 <div id="number_of_observation_periods" class="section level3 unnumbered" number="">
 <h3>number_of_observation_periods</h3>
-<div class="sourceCode" id="cb31"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb31-1"><a href="materialized-views-1.html#cb31-1" aria-hidden="true"></a><span class="kw">SELECT</span> ar.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb31-2"><a href="materialized-views-1.html#cb31-2" aria-hidden="true"></a>   ds.acronym,</span>
-<span id="cb31-3"><a href="materialized-views-1.html#cb31-3" aria-hidden="true"></a>   ds.name,</span>
-<span id="cb31-4"><a href="materialized-views-1.html#cb31-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb31-5"><a href="materialized-views-1.html#cb31-5" aria-hidden="true"></a>   ar.stratum_1,</span>
-<span id="cb31-6"><a href="materialized-views-1.html#cb31-6" aria-hidden="true"></a>   ar.count_value,</span>
-<span id="cb31-7"><a href="materialized-views-1.html#cb31-7" aria-hidden="true"></a>   pa.nrpatients <span class="kw">AS</span> patients,</span>
-<span id="cb31-8"><a href="materialized-views-1.html#cb31-8" aria-hidden="true"></a>   <span class="fu">round</span>((((<span class="dv">100</span>):<span class="ch">:numeric</span> <span class="op">*</span> (ar.count_value):<span class="ch">:numeric</span>) <span class="op">/</span> (pa.nrpatients):<span class="ch">:numeric</span>), <span class="dv">2</span>) <span class="kw">AS</span> percentage</span>
-<span id="cb31-9"><a href="materialized-views-1.html#cb31-9" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results ar</span>
-<span id="cb31-10"><a href="materialized-views-1.html#cb31-10" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source ds <span class="kw">ON</span> ((ds.<span class="kw">id</span> <span class="op">=</span> ar.data_source_id)))</span>
-<span id="cb31-11"><a href="materialized-views-1.html#cb31-11" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((ds.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
-<span id="cb31-12"><a href="materialized-views-1.html#cb31-12" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.count_value <span class="kw">AS</span> nrpatients,</span>
-<span id="cb31-13"><a href="materialized-views-1.html#cb31-13" aria-hidden="true"></a>           achilles_results.data_source_id</span>
-<span id="cb31-14"><a href="materialized-views-1.html#cb31-14" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb31-15"><a href="materialized-views-1.html#cb31-15" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">0</span>)) pa <span class="kw">ON</span> ((pa.data_source_id <span class="op">=</span> ds.<span class="kw">id</span>)))</span>
-<span id="cb31-16"><a href="materialized-views-1.html#cb31-16" aria-hidden="true"></a> <span class="kw">WHERE</span> (ar.analysis_id <span class="op">=</span> <span class="dv">113</span>);</span></code></pre></div>
+<div class="sourceCode" id="cb30"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb30-1"><a href="materialized-views-1.html#cb30-1" aria-hidden="true"></a><span class="kw">SELECT</span> ar.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb30-2"><a href="materialized-views-1.html#cb30-2" aria-hidden="true"></a>   ds.acronym,</span>
+<span id="cb30-3"><a href="materialized-views-1.html#cb30-3" aria-hidden="true"></a>   ds.name,</span>
+<span id="cb30-4"><a href="materialized-views-1.html#cb30-4" aria-hidden="true"></a>   country.country,</span>
+<span id="cb30-5"><a href="materialized-views-1.html#cb30-5" aria-hidden="true"></a>   ar.stratum_1,</span>
+<span id="cb30-6"><a href="materialized-views-1.html#cb30-6" aria-hidden="true"></a>   ar.count_value,</span>
+<span id="cb30-7"><a href="materialized-views-1.html#cb30-7" aria-hidden="true"></a>   pa.nrpatients <span class="kw">AS</span> patients,</span>
+<span id="cb30-8"><a href="materialized-views-1.html#cb30-8" aria-hidden="true"></a>   <span class="fu">round</span>(</span>
+<span id="cb30-9"><a href="materialized-views-1.html#cb30-9" aria-hidden="true"></a>     (</span>
+<span id="cb30-10"><a href="materialized-views-1.html#cb30-10" aria-hidden="true"></a>       ((<span class="dv">100</span>):<span class="ch">:numeric</span> <span class="op">*</span> (ar.count_value):<span class="ch">:numeric</span>)</span>
+<span id="cb30-11"><a href="materialized-views-1.html#cb30-11" aria-hidden="true"></a>       <span class="op">/</span></span>
+<span id="cb30-12"><a href="materialized-views-1.html#cb30-12" aria-hidden="true"></a>       (pa.nrpatients):<span class="ch">:numeric</span></span>
+<span id="cb30-13"><a href="materialized-views-1.html#cb30-13" aria-hidden="true"></a>     ),</span>
+<span id="cb30-14"><a href="materialized-views-1.html#cb30-14" aria-hidden="true"></a>     <span class="dv">2</span></span>
+<span id="cb30-15"><a href="materialized-views-1.html#cb30-15" aria-hidden="true"></a>   ) <span class="kw">AS</span> percentage</span>
+<span id="cb30-16"><a href="materialized-views-1.html#cb30-16" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results ar</span>
+<span id="cb30-17"><a href="materialized-views-1.html#cb30-17" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source ds <span class="kw">ON</span> ((ds.<span class="kw">id</span> <span class="op">=</span> ar.data_source_id)))</span>
+<span id="cb30-18"><a href="materialized-views-1.html#cb30-18" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((ds.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
+<span id="cb30-19"><a href="materialized-views-1.html#cb30-19" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.count_value <span class="kw">AS</span> nrpatients,</span>
+<span id="cb30-20"><a href="materialized-views-1.html#cb30-20" aria-hidden="true"></a>           achilles_results.data_source_id</span>
+<span id="cb30-21"><a href="materialized-views-1.html#cb30-21" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb30-22"><a href="materialized-views-1.html#cb30-22" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">0</span>)) pa</span>
+<span id="cb30-23"><a href="materialized-views-1.html#cb30-23" aria-hidden="true"></a>           <span class="kw">ON</span> ((pa.data_source_id <span class="op">=</span> ds.<span class="kw">id</span>)))</span>
+<span id="cb30-24"><a href="materialized-views-1.html#cb30-24" aria-hidden="true"></a> <span class="kw">WHERE</span> (ar.analysis_id <span class="op">=</span> <span class="dv">113</span>);</span></code></pre></div>
 </div>
 <div id="length_of_observation_of_first_observation_period" class="section level3 unnumbered" number="">
 <h3>length_of_observation_of_first_observation_period</h3>
-<div class="sourceCode" id="cb32"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb32-1"><a href="materialized-views-1.html#cb32-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb32-2"><a href="materialized-views-1.html#cb32-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb32-3"><a href="materialized-views-1.html#cb32-3" aria-hidden="true"></a>   country.country,</span>
-<span id="cb32-4"><a href="materialized-views-1.html#cb32-4" aria-hidden="true"></a>   achilles.count_value,</span>
-<span id="cb32-5"><a href="materialized-views-1.html#cb32-5" aria-hidden="true"></a>   achilles.min_value,</span>
-<span id="cb32-6"><a href="materialized-views-1.html#cb32-6" aria-hidden="true"></a>   achilles.p10_value <span class="kw">AS</span> p10,</span>
-<span id="cb32-7"><a href="materialized-views-1.html#cb32-7" aria-hidden="true"></a>   achilles.p25_value <span class="kw">AS</span> p25,</span>
-<span id="cb32-8"><a href="materialized-views-1.html#cb32-8" aria-hidden="true"></a>   achilles.median_value <span class="kw">AS</span> <span class="fu">median</span>,</span>
-<span id="cb32-9"><a href="materialized-views-1.html#cb32-9" aria-hidden="true"></a>   achilles.p75_value <span class="kw">AS</span> p75,</span>
-<span id="cb32-10"><a href="materialized-views-1.html#cb32-10" aria-hidden="true"></a>   achilles.p90_value <span class="kw">AS</span> p90,</span>
-<span id="cb32-11"><a href="materialized-views-1.html#cb32-11" aria-hidden="true"></a>   achilles.max_value</span>
-<span id="cb32-12"><a href="materialized-views-1.html#cb32-12" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
-<span id="cb32-13"><a href="materialized-views-1.html#cb32-13" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb32-14"><a href="materialized-views-1.html#cb32-14" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((<span class="kw">source</span>.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
-<span id="cb32-15"><a href="materialized-views-1.html#cb32-15" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">105</span>)</span>
-<span id="cb32-16"><a href="materialized-views-1.html#cb32-16" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> <span class="kw">source</span>.name;</span></code></pre></div>
+<div class="sourceCode" id="cb31"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb31-1"><a href="materialized-views-1.html#cb31-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb31-2"><a href="materialized-views-1.html#cb31-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
+<span id="cb31-3"><a href="materialized-views-1.html#cb31-3" aria-hidden="true"></a>   country.country,</span>
+<span id="cb31-4"><a href="materialized-views-1.html#cb31-4" aria-hidden="true"></a>   achilles.count_value,</span>
+<span id="cb31-5"><a href="materialized-views-1.html#cb31-5" aria-hidden="true"></a>   achilles.min_value,</span>
+<span id="cb31-6"><a href="materialized-views-1.html#cb31-6" aria-hidden="true"></a>   achilles.p10_value <span class="kw">AS</span> p10,</span>
+<span id="cb31-7"><a href="materialized-views-1.html#cb31-7" aria-hidden="true"></a>   achilles.p25_value <span class="kw">AS</span> p25,</span>
+<span id="cb31-8"><a href="materialized-views-1.html#cb31-8" aria-hidden="true"></a>   achilles.median_value <span class="kw">AS</span> <span class="fu">median</span>,</span>
+<span id="cb31-9"><a href="materialized-views-1.html#cb31-9" aria-hidden="true"></a>   achilles.p75_value <span class="kw">AS</span> p75,</span>
+<span id="cb31-10"><a href="materialized-views-1.html#cb31-10" aria-hidden="true"></a>   achilles.p90_value <span class="kw">AS</span> p90,</span>
+<span id="cb31-11"><a href="materialized-views-1.html#cb31-11" aria-hidden="true"></a>   achilles.max_value</span>
+<span id="cb31-12"><a href="materialized-views-1.html#cb31-12" aria-hidden="true"></a>  <span class="kw">FROM</span> ((achilles_results achilles</span>
+<span id="cb31-13"><a href="materialized-views-1.html#cb31-13" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb31-14"><a href="materialized-views-1.html#cb31-14" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
+<span id="cb31-15"><a href="materialized-views-1.html#cb31-15" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((<span class="kw">source</span>.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
+<span id="cb31-16"><a href="materialized-views-1.html#cb31-16" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">105</span>)</span>
+<span id="cb31-17"><a href="materialized-views-1.html#cb31-17" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> <span class="kw">source</span>.name;</span></code></pre></div>
 </div>
 <div id="visit_type_bar_chart" class="section level3 unnumbered" number="">
 <h3>visit_type_bar_chart</h3>
+<div class="sourceCode" id="cb32"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb32-1"><a href="materialized-views-1.html#cb32-1" aria-hidden="true"></a><span class="kw">SELECT</span> data_source.name,</span>
+<span id="cb32-2"><a href="materialized-views-1.html#cb32-2" aria-hidden="true"></a>   data_source.acronym,</span>
+<span id="cb32-3"><a href="materialized-views-1.html#cb32-3" aria-hidden="true"></a>   data_source.database_type,</span>
+<span id="cb32-4"><a href="materialized-views-1.html#cb32-4" aria-hidden="true"></a>   country.country,</span>
+<span id="cb32-5"><a href="materialized-views-1.html#cb32-5" aria-hidden="true"></a>   concept.concept_name,</span>
+<span id="cb32-6"><a href="materialized-views-1.html#cb32-6" aria-hidden="true"></a>   achilles_results.count_value <span class="kw">AS</span> num_persons</span>
+<span id="cb32-7"><a href="materialized-views-1.html#cb32-7" aria-hidden="true"></a>  <span class="kw">FROM</span> (((( <span class="kw">SELECT</span> achilles_results_1.<span class="kw">id</span>,</span>
+<span id="cb32-8"><a href="materialized-views-1.html#cb32-8" aria-hidden="true"></a>           achilles_results_1.analysis_id,</span>
+<span id="cb32-9"><a href="materialized-views-1.html#cb32-9" aria-hidden="true"></a>           achilles_results_1.stratum_1,</span>
+<span id="cb32-10"><a href="materialized-views-1.html#cb32-10" aria-hidden="true"></a>           achilles_results_1.stratum_2,</span>
+<span id="cb32-11"><a href="materialized-views-1.html#cb32-11" aria-hidden="true"></a>           achilles_results_1.stratum_3,</span>
+<span id="cb32-12"><a href="materialized-views-1.html#cb32-12" aria-hidden="true"></a>           achilles_results_1.stratum_4,</span>
+<span id="cb32-13"><a href="materialized-views-1.html#cb32-13" aria-hidden="true"></a>           achilles_results_1.stratum_5,</span>
+<span id="cb32-14"><a href="materialized-views-1.html#cb32-14" aria-hidden="true"></a>           achilles_results_1.count_value,</span>
+<span id="cb32-15"><a href="materialized-views-1.html#cb32-15" aria-hidden="true"></a>           achilles_results_1.data_source_id,</span>
+<span id="cb32-16"><a href="materialized-views-1.html#cb32-16" aria-hidden="true"></a>           achilles_results_1.avg_value,</span>
+<span id="cb32-17"><a href="materialized-views-1.html#cb32-17" aria-hidden="true"></a>           achilles_results_1.max_value,</span>
+<span id="cb32-18"><a href="materialized-views-1.html#cb32-18" aria-hidden="true"></a>           achilles_results_1.median_value,</span>
+<span id="cb32-19"><a href="materialized-views-1.html#cb32-19" aria-hidden="true"></a>           achilles_results_1.min_value,</span>
+<span id="cb32-20"><a href="materialized-views-1.html#cb32-20" aria-hidden="true"></a>           achilles_results_1.p10_value,</span>
+<span id="cb32-21"><a href="materialized-views-1.html#cb32-21" aria-hidden="true"></a>           achilles_results_1.p25_value,</span>
+<span id="cb32-22"><a href="materialized-views-1.html#cb32-22" aria-hidden="true"></a>           achilles_results_1.p75_value,</span>
+<span id="cb32-23"><a href="materialized-views-1.html#cb32-23" aria-hidden="true"></a>           achilles_results_1.p90_value,</span>
+<span id="cb32-24"><a href="materialized-views-1.html#cb32-24" aria-hidden="true"></a>           achilles_results_1.stdev_value</span>
+<span id="cb32-25"><a href="materialized-views-1.html#cb32-25" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results achilles_results_1</span>
+<span id="cb32-26"><a href="materialized-views-1.html#cb32-26" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results_1.analysis_id <span class="op">=</span> <span class="dv">200</span>)</span>
+<span id="cb32-27"><a href="materialized-views-1.html#cb32-27" aria-hidden="true"></a>         ) achilles_results</span>
+<span id="cb32-28"><a href="materialized-views-1.html#cb32-28" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source</span>
+<span id="cb32-29"><a href="materialized-views-1.html#cb32-29" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles_results.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)))</span>
+<span id="cb32-30"><a href="materialized-views-1.html#cb32-30" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> data_source.country_id)))</span>
+<span id="cb32-31"><a href="materialized-views-1.html#cb32-31" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept</span>
+<span id="cb32-32"><a href="materialized-views-1.html#cb32-32" aria-hidden="true"></a>      <span class="kw">ON</span></span>
+<span id="cb32-33"><a href="materialized-views-1.html#cb32-33" aria-hidden="true"></a>        (achilles_results.stratum_1):<span class="ch">:integer</span></span>
+<span id="cb32-34"><a href="materialized-views-1.html#cb32-34" aria-hidden="true"></a>        <span class="op">=</span></span>
+<span id="cb32-35"><a href="materialized-views-1.html#cb32-35" aria-hidden="true"></a>        concept.concept_id</span>
+<span id="cb32-36"><a href="materialized-views-1.html#cb32-36" aria-hidden="true"></a>        );</span></code></pre></div>
+</div>
+<div id="visit_type_table" class="section level3 unnumbered" number="">
+<h3>visit_type_table</h3>
 <div class="sourceCode" id="cb33"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb33-1"><a href="materialized-views-1.html#cb33-1" aria-hidden="true"></a><span class="kw">SELECT</span> data_source.name,</span>
 <span id="cb33-2"><a href="materialized-views-1.html#cb33-2" aria-hidden="true"></a>   data_source.acronym,</span>
 <span id="cb33-3"><a href="materialized-views-1.html#cb33-3" aria-hidden="true"></a>   data_source.database_type,</span>
 <span id="cb33-4"><a href="materialized-views-1.html#cb33-4" aria-hidden="true"></a>   country.country,</span>
 <span id="cb33-5"><a href="materialized-views-1.html#cb33-5" aria-hidden="true"></a>   concept.concept_name,</span>
-<span id="cb33-6"><a href="materialized-views-1.html#cb33-6" aria-hidden="true"></a>   achilles_results.count_value <span class="kw">AS</span> num_persons</span>
-<span id="cb33-7"><a href="materialized-views-1.html#cb33-7" aria-hidden="true"></a>  <span class="kw">FROM</span> (((( <span class="kw">SELECT</span> achilles_results_1.<span class="kw">id</span>,</span>
-<span id="cb33-8"><a href="materialized-views-1.html#cb33-8" aria-hidden="true"></a>           achilles_results_1.analysis_id,</span>
-<span id="cb33-9"><a href="materialized-views-1.html#cb33-9" aria-hidden="true"></a>           achilles_results_1.stratum_1,</span>
-<span id="cb33-10"><a href="materialized-views-1.html#cb33-10" aria-hidden="true"></a>           achilles_results_1.stratum_2,</span>
-<span id="cb33-11"><a href="materialized-views-1.html#cb33-11" aria-hidden="true"></a>           achilles_results_1.stratum_3,</span>
-<span id="cb33-12"><a href="materialized-views-1.html#cb33-12" aria-hidden="true"></a>           achilles_results_1.stratum_4,</span>
-<span id="cb33-13"><a href="materialized-views-1.html#cb33-13" aria-hidden="true"></a>           achilles_results_1.stratum_5,</span>
-<span id="cb33-14"><a href="materialized-views-1.html#cb33-14" aria-hidden="true"></a>           achilles_results_1.count_value,</span>
-<span id="cb33-15"><a href="materialized-views-1.html#cb33-15" aria-hidden="true"></a>           achilles_results_1.data_source_id,</span>
-<span id="cb33-16"><a href="materialized-views-1.html#cb33-16" aria-hidden="true"></a>           achilles_results_1.avg_value,</span>
-<span id="cb33-17"><a href="materialized-views-1.html#cb33-17" aria-hidden="true"></a>           achilles_results_1.max_value,</span>
-<span id="cb33-18"><a href="materialized-views-1.html#cb33-18" aria-hidden="true"></a>           achilles_results_1.median_value,</span>
-<span id="cb33-19"><a href="materialized-views-1.html#cb33-19" aria-hidden="true"></a>           achilles_results_1.min_value,</span>
-<span id="cb33-20"><a href="materialized-views-1.html#cb33-20" aria-hidden="true"></a>           achilles_results_1.p10_value,</span>
-<span id="cb33-21"><a href="materialized-views-1.html#cb33-21" aria-hidden="true"></a>           achilles_results_1.p25_value,</span>
-<span id="cb33-22"><a href="materialized-views-1.html#cb33-22" aria-hidden="true"></a>           achilles_results_1.p75_value,</span>
-<span id="cb33-23"><a href="materialized-views-1.html#cb33-23" aria-hidden="true"></a>           achilles_results_1.p90_value,</span>
-<span id="cb33-24"><a href="materialized-views-1.html#cb33-24" aria-hidden="true"></a>           achilles_results_1.stdev_value</span>
-<span id="cb33-25"><a href="materialized-views-1.html#cb33-25" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results achilles_results_1</span>
-<span id="cb33-26"><a href="materialized-views-1.html#cb33-26" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results_1.analysis_id <span class="op">=</span> <span class="dv">200</span>)) achilles_results</span>
-<span id="cb33-27"><a href="materialized-views-1.html#cb33-27" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">ON</span> ((achilles_results.data_source_id <span class="op">=</span> data_source.<span class="kw">id</span>)))</span>
-<span id="cb33-28"><a href="materialized-views-1.html#cb33-28" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> data_source.country_id)))</span>
-<span id="cb33-29"><a href="materialized-views-1.html#cb33-29" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept <span class="kw">ON</span> (((achilles_results.stratum_1):<span class="ch">:integer</span> <span class="op">=</span> concept.concept_id)));</span></code></pre></div>
-</div>
-<div id="visit_type_table" class="section level3 unnumbered" number="">
-<h3>visit_type_table</h3>
-<div class="sourceCode" id="cb34"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb34-1"><a href="materialized-views-1.html#cb34-1" aria-hidden="true"></a><span class="kw">SELECT</span> data_source.name,</span>
-<span id="cb34-2"><a href="materialized-views-1.html#cb34-2" aria-hidden="true"></a>   data_source.acronym,</span>
-<span id="cb34-3"><a href="materialized-views-1.html#cb34-3" aria-hidden="true"></a>   data_source.database_type,</span>
-<span id="cb34-4"><a href="materialized-views-1.html#cb34-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb34-5"><a href="materialized-views-1.html#cb34-5" aria-hidden="true"></a>   concept.concept_name,</span>
-<span id="cb34-6"><a href="materialized-views-1.html#cb34-6" aria-hidden="true"></a>   ar1.count_value <span class="kw">AS</span> num_persons,</span>
-<span id="cb34-7"><a href="materialized-views-1.html#cb34-7" aria-hidden="true"></a>   <span class="fu">round</span>(((<span class="fl">100.0</span> <span class="op">*</span> (ar1.count_value):<span class="ch">:numeric</span>) <span class="op">/</span> (denom.count_value):<span class="ch">:numeric</span>), <span class="dv">2</span>) <span class="kw">AS</span> percent_persons,</span>
-<span id="cb34-8"><a href="materialized-views-1.html#cb34-8" aria-hidden="true"></a>   <span class="fu">round</span>(((<span class="fl">1.0</span> <span class="op">*</span> (ar2.count_value):<span class="ch">:numeric</span>) <span class="op">/</span> (ar1.count_value):<span class="ch">:numeric</span>), <span class="dv">2</span>) <span class="kw">AS</span> records_per_person</span>
-<span id="cb34-9"><a href="materialized-views-1.html#cb34-9" aria-hidden="true"></a>  <span class="kw">FROM</span> (((((( <span class="kw">SELECT</span> achilles_results.<span class="kw">id</span>,</span>
-<span id="cb34-10"><a href="materialized-views-1.html#cb34-10" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
-<span id="cb34-11"><a href="materialized-views-1.html#cb34-11" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb34-12"><a href="materialized-views-1.html#cb34-12" aria-hidden="true"></a>           achilles_results.stratum_2,</span>
-<span id="cb34-13"><a href="materialized-views-1.html#cb34-13" aria-hidden="true"></a>           achilles_results.stratum_3,</span>
-<span id="cb34-14"><a href="materialized-views-1.html#cb34-14" aria-hidden="true"></a>           achilles_results.stratum_4,</span>
-<span id="cb34-15"><a href="materialized-views-1.html#cb34-15" aria-hidden="true"></a>           achilles_results.stratum_5,</span>
-<span id="cb34-16"><a href="materialized-views-1.html#cb34-16" aria-hidden="true"></a>           achilles_results.count_value,</span>
-<span id="cb34-17"><a href="materialized-views-1.html#cb34-17" aria-hidden="true"></a>           achilles_results.data_source_id,</span>
-<span id="cb34-18"><a href="materialized-views-1.html#cb34-18" aria-hidden="true"></a>           achilles_results.avg_value,</span>
-<span id="cb34-19"><a href="materialized-views-1.html#cb34-19" aria-hidden="true"></a>           achilles_results.max_value,</span>
-<span id="cb34-20"><a href="materialized-views-1.html#cb34-20" aria-hidden="true"></a>           achilles_results.median_value,</span>
-<span id="cb34-21"><a href="materialized-views-1.html#cb34-21" aria-hidden="true"></a>           achilles_results.min_value,</span>
-<span id="cb34-22"><a href="materialized-views-1.html#cb34-22" aria-hidden="true"></a>           achilles_results.p10_value,</span>
-<span id="cb34-23"><a href="materialized-views-1.html#cb34-23" aria-hidden="true"></a>           achilles_results.p25_value,</span>
-<span id="cb34-24"><a href="materialized-views-1.html#cb34-24" aria-hidden="true"></a>           achilles_results.p75_value,</span>
-<span id="cb34-25"><a href="materialized-views-1.html#cb34-25" aria-hidden="true"></a>           achilles_results.p90_value,</span>
-<span id="cb34-26"><a href="materialized-views-1.html#cb34-26" aria-hidden="true"></a>           achilles_results.stdev_value</span>
-<span id="cb34-27"><a href="materialized-views-1.html#cb34-27" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb34-28"><a href="materialized-views-1.html#cb34-28" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">200</span>)) ar1</span>
-<span id="cb34-29"><a href="materialized-views-1.html#cb34-29" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.<span class="kw">id</span>,</span>
-<span id="cb34-30"><a href="materialized-views-1.html#cb34-30" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
-<span id="cb34-31"><a href="materialized-views-1.html#cb34-31" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb34-32"><a href="materialized-views-1.html#cb34-32" aria-hidden="true"></a>           achilles_results.stratum_2,</span>
-<span id="cb34-33"><a href="materialized-views-1.html#cb34-33" aria-hidden="true"></a>           achilles_results.stratum_3,</span>
-<span id="cb34-34"><a href="materialized-views-1.html#cb34-34" aria-hidden="true"></a>           achilles_results.stratum_4,</span>
-<span id="cb34-35"><a href="materialized-views-1.html#cb34-35" aria-hidden="true"></a>           achilles_results.stratum_5,</span>
-<span id="cb34-36"><a href="materialized-views-1.html#cb34-36" aria-hidden="true"></a>           achilles_results.count_value,</span>
-<span id="cb34-37"><a href="materialized-views-1.html#cb34-37" aria-hidden="true"></a>           achilles_results.data_source_id,</span>
-<span id="cb34-38"><a href="materialized-views-1.html#cb34-38" aria-hidden="true"></a>           achilles_results.avg_value,</span>
-<span id="cb34-39"><a href="materialized-views-1.html#cb34-39" aria-hidden="true"></a>           achilles_results.max_value,</span>
-<span id="cb34-40"><a href="materialized-views-1.html#cb34-40" aria-hidden="true"></a>           achilles_results.median_value,</span>
-<span id="cb34-41"><a href="materialized-views-1.html#cb34-41" aria-hidden="true"></a>           achilles_results.min_value,</span>
-<span id="cb34-42"><a href="materialized-views-1.html#cb34-42" aria-hidden="true"></a>           achilles_results.p10_value,</span>
-<span id="cb34-43"><a href="materialized-views-1.html#cb34-43" aria-hidden="true"></a>           achilles_results.p25_value,</span>
-<span id="cb34-44"><a href="materialized-views-1.html#cb34-44" aria-hidden="true"></a>           achilles_results.p75_value,</span>
-<span id="cb34-45"><a href="materialized-views-1.html#cb34-45" aria-hidden="true"></a>           achilles_results.p90_value,</span>
-<span id="cb34-46"><a href="materialized-views-1.html#cb34-46" aria-hidden="true"></a>           achilles_results.stdev_value</span>
-<span id="cb34-47"><a href="materialized-views-1.html#cb34-47" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb34-48"><a href="materialized-views-1.html#cb34-48" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">201</span>)) ar2 <span class="kw">ON</span> (((ar1.stratum_1 <span class="op">=</span> ar2.stratum_1) <span class="kw">AND</span> (ar1.data_source_id <span class="op">=</span> ar2.data_source_id))))</span>
-<span id="cb34-49"><a href="materialized-views-1.html#cb34-49" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.<span class="kw">id</span>,</span>
-<span id="cb34-50"><a href="materialized-views-1.html#cb34-50" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
-<span id="cb34-51"><a href="materialized-views-1.html#cb34-51" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb34-52"><a href="materialized-views-1.html#cb34-52" aria-hidden="true"></a>           achilles_results.stratum_2,</span>
-<span id="cb34-53"><a href="materialized-views-1.html#cb34-53" aria-hidden="true"></a>           achilles_results.stratum_3,</span>
-<span id="cb34-54"><a href="materialized-views-1.html#cb34-54" aria-hidden="true"></a>           achilles_results.stratum_4,</span>
-<span id="cb34-55"><a href="materialized-views-1.html#cb34-55" aria-hidden="true"></a>           achilles_results.stratum_5,</span>
-<span id="cb34-56"><a href="materialized-views-1.html#cb34-56" aria-hidden="true"></a>           achilles_results.count_value,</span>
-<span id="cb34-57"><a href="materialized-views-1.html#cb34-57" aria-hidden="true"></a>           achilles_results.data_source_id,</span>
-<span id="cb34-58"><a href="materialized-views-1.html#cb34-58" aria-hidden="true"></a>           achilles_results.avg_value,</span>
-<span id="cb34-59"><a href="materialized-views-1.html#cb34-59" aria-hidden="true"></a>           achilles_results.max_value,</span>
-<span id="cb34-60"><a href="materialized-views-1.html#cb34-60" aria-hidden="true"></a>           achilles_results.median_value,</span>
-<span id="cb34-61"><a href="materialized-views-1.html#cb34-61" aria-hidden="true"></a>           achilles_results.min_value,</span>
-<span id="cb34-62"><a href="materialized-views-1.html#cb34-62" aria-hidden="true"></a>           achilles_results.p10_value,</span>
-<span id="cb34-63"><a href="materialized-views-1.html#cb34-63" aria-hidden="true"></a>           achilles_results.p25_value,</span>
-<span id="cb34-64"><a href="materialized-views-1.html#cb34-64" aria-hidden="true"></a>           achilles_results.p75_value,</span>
-<span id="cb34-65"><a href="materialized-views-1.html#cb34-65" aria-hidden="true"></a>           achilles_results.p90_value,</span>
-<span id="cb34-66"><a href="materialized-views-1.html#cb34-66" aria-hidden="true"></a>           achilles_results.stdev_value</span>
-<span id="cb34-67"><a href="materialized-views-1.html#cb34-67" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb34-68"><a href="materialized-views-1.html#cb34-68" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1</span>)) denom <span class="kw">ON</span> ((ar1.data_source_id <span class="op">=</span> denom.data_source_id)))</span>
-<span id="cb34-69"><a href="materialized-views-1.html#cb34-69" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">ON</span> ((data_source.<span class="kw">id</span> <span class="op">=</span> ar1.data_source_id)))</span>
-<span id="cb34-70"><a href="materialized-views-1.html#cb34-70" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> data_source.country_id)))</span>
-<span id="cb34-71"><a href="materialized-views-1.html#cb34-71" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept <span class="kw">ON</span> (((ar1.stratum_1):<span class="ch">:integer</span> <span class="op">=</span> concept.concept_id)))</span>
-<span id="cb34-72"><a href="materialized-views-1.html#cb34-72" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> ar1.data_source_id, ar1.count_value <span class="kw">DESC</span>;</span></code></pre></div>
+<span id="cb33-6"><a href="materialized-views-1.html#cb33-6" aria-hidden="true"></a>   ar1.count_value <span class="kw">AS</span> num_persons,</span>
+<span id="cb33-7"><a href="materialized-views-1.html#cb33-7" aria-hidden="true"></a>   <span class="fu">round</span>(</span>
+<span id="cb33-8"><a href="materialized-views-1.html#cb33-8" aria-hidden="true"></a>     (</span>
+<span id="cb33-9"><a href="materialized-views-1.html#cb33-9" aria-hidden="true"></a>       (<span class="fl">100.0</span> <span class="op">*</span> (ar1.count_value):<span class="ch">:numeric</span>)</span>
+<span id="cb33-10"><a href="materialized-views-1.html#cb33-10" aria-hidden="true"></a>       <span class="op">/</span></span>
+<span id="cb33-11"><a href="materialized-views-1.html#cb33-11" aria-hidden="true"></a>       (denom.count_value):<span class="ch">:numeric</span></span>
+<span id="cb33-12"><a href="materialized-views-1.html#cb33-12" aria-hidden="true"></a>     ),</span>
+<span id="cb33-13"><a href="materialized-views-1.html#cb33-13" aria-hidden="true"></a>     <span class="dv">2</span></span>
+<span id="cb33-14"><a href="materialized-views-1.html#cb33-14" aria-hidden="true"></a>   ) <span class="kw">AS</span> percent_persons,</span>
+<span id="cb33-15"><a href="materialized-views-1.html#cb33-15" aria-hidden="true"></a>   <span class="fu">round</span>(</span>
+<span id="cb33-16"><a href="materialized-views-1.html#cb33-16" aria-hidden="true"></a>     (</span>
+<span id="cb33-17"><a href="materialized-views-1.html#cb33-17" aria-hidden="true"></a>       (<span class="fl">1.0</span> <span class="op">*</span> (ar2.count_value):<span class="ch">:numeric</span>)</span>
+<span id="cb33-18"><a href="materialized-views-1.html#cb33-18" aria-hidden="true"></a>       <span class="op">/</span></span>
+<span id="cb33-19"><a href="materialized-views-1.html#cb33-19" aria-hidden="true"></a>       (ar1.count_value):<span class="ch">:numeric</span></span>
+<span id="cb33-20"><a href="materialized-views-1.html#cb33-20" aria-hidden="true"></a>     ),</span>
+<span id="cb33-21"><a href="materialized-views-1.html#cb33-21" aria-hidden="true"></a>     <span class="dv">2</span></span>
+<span id="cb33-22"><a href="materialized-views-1.html#cb33-22" aria-hidden="true"></a>   ) <span class="kw">AS</span> records_per_person</span>
+<span id="cb33-23"><a href="materialized-views-1.html#cb33-23" aria-hidden="true"></a>  <span class="kw">FROM</span> (((((( <span class="kw">SELECT</span> achilles_results.<span class="kw">id</span>,</span>
+<span id="cb33-24"><a href="materialized-views-1.html#cb33-24" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
+<span id="cb33-25"><a href="materialized-views-1.html#cb33-25" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb33-26"><a href="materialized-views-1.html#cb33-26" aria-hidden="true"></a>           achilles_results.stratum_2,</span>
+<span id="cb33-27"><a href="materialized-views-1.html#cb33-27" aria-hidden="true"></a>           achilles_results.stratum_3,</span>
+<span id="cb33-28"><a href="materialized-views-1.html#cb33-28" aria-hidden="true"></a>           achilles_results.stratum_4,</span>
+<span id="cb33-29"><a href="materialized-views-1.html#cb33-29" aria-hidden="true"></a>           achilles_results.stratum_5,</span>
+<span id="cb33-30"><a href="materialized-views-1.html#cb33-30" aria-hidden="true"></a>           achilles_results.count_value,</span>
+<span id="cb33-31"><a href="materialized-views-1.html#cb33-31" aria-hidden="true"></a>           achilles_results.data_source_id,</span>
+<span id="cb33-32"><a href="materialized-views-1.html#cb33-32" aria-hidden="true"></a>           achilles_results.avg_value,</span>
+<span id="cb33-33"><a href="materialized-views-1.html#cb33-33" aria-hidden="true"></a>           achilles_results.max_value,</span>
+<span id="cb33-34"><a href="materialized-views-1.html#cb33-34" aria-hidden="true"></a>           achilles_results.median_value,</span>
+<span id="cb33-35"><a href="materialized-views-1.html#cb33-35" aria-hidden="true"></a>           achilles_results.min_value,</span>
+<span id="cb33-36"><a href="materialized-views-1.html#cb33-36" aria-hidden="true"></a>           achilles_results.p10_value,</span>
+<span id="cb33-37"><a href="materialized-views-1.html#cb33-37" aria-hidden="true"></a>           achilles_results.p25_value,</span>
+<span id="cb33-38"><a href="materialized-views-1.html#cb33-38" aria-hidden="true"></a>           achilles_results.p75_value,</span>
+<span id="cb33-39"><a href="materialized-views-1.html#cb33-39" aria-hidden="true"></a>           achilles_results.p90_value,</span>
+<span id="cb33-40"><a href="materialized-views-1.html#cb33-40" aria-hidden="true"></a>           achilles_results.stdev_value</span>
+<span id="cb33-41"><a href="materialized-views-1.html#cb33-41" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb33-42"><a href="materialized-views-1.html#cb33-42" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">200</span>)) ar1</span>
+<span id="cb33-43"><a href="materialized-views-1.html#cb33-43" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.<span class="kw">id</span>,</span>
+<span id="cb33-44"><a href="materialized-views-1.html#cb33-44" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
+<span id="cb33-45"><a href="materialized-views-1.html#cb33-45" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb33-46"><a href="materialized-views-1.html#cb33-46" aria-hidden="true"></a>           achilles_results.stratum_2,</span>
+<span id="cb33-47"><a href="materialized-views-1.html#cb33-47" aria-hidden="true"></a>           achilles_results.stratum_3,</span>
+<span id="cb33-48"><a href="materialized-views-1.html#cb33-48" aria-hidden="true"></a>           achilles_results.stratum_4,</span>
+<span id="cb33-49"><a href="materialized-views-1.html#cb33-49" aria-hidden="true"></a>           achilles_results.stratum_5,</span>
+<span id="cb33-50"><a href="materialized-views-1.html#cb33-50" aria-hidden="true"></a>           achilles_results.count_value,</span>
+<span id="cb33-51"><a href="materialized-views-1.html#cb33-51" aria-hidden="true"></a>           achilles_results.data_source_id,</span>
+<span id="cb33-52"><a href="materialized-views-1.html#cb33-52" aria-hidden="true"></a>           achilles_results.avg_value,</span>
+<span id="cb33-53"><a href="materialized-views-1.html#cb33-53" aria-hidden="true"></a>           achilles_results.max_value,</span>
+<span id="cb33-54"><a href="materialized-views-1.html#cb33-54" aria-hidden="true"></a>           achilles_results.median_value,</span>
+<span id="cb33-55"><a href="materialized-views-1.html#cb33-55" aria-hidden="true"></a>           achilles_results.min_value,</span>
+<span id="cb33-56"><a href="materialized-views-1.html#cb33-56" aria-hidden="true"></a>           achilles_results.p10_value,</span>
+<span id="cb33-57"><a href="materialized-views-1.html#cb33-57" aria-hidden="true"></a>           achilles_results.p25_value,</span>
+<span id="cb33-58"><a href="materialized-views-1.html#cb33-58" aria-hidden="true"></a>           achilles_results.p75_value,</span>
+<span id="cb33-59"><a href="materialized-views-1.html#cb33-59" aria-hidden="true"></a>           achilles_results.p90_value,</span>
+<span id="cb33-60"><a href="materialized-views-1.html#cb33-60" aria-hidden="true"></a>           achilles_results.stdev_value</span>
+<span id="cb33-61"><a href="materialized-views-1.html#cb33-61" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb33-62"><a href="materialized-views-1.html#cb33-62" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">201</span>)) ar2</span>
+<span id="cb33-63"><a href="materialized-views-1.html#cb33-63" aria-hidden="true"></a>           <span class="kw">ON</span> (((ar1.stratum_1 <span class="op">=</span> ar2.stratum_1)</span>
+<span id="cb33-64"><a href="materialized-views-1.html#cb33-64" aria-hidden="true"></a>             <span class="kw">AND</span> (ar1.data_source_id <span class="op">=</span> ar2.data_source_id))))</span>
+<span id="cb33-65"><a href="materialized-views-1.html#cb33-65" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.<span class="kw">id</span>,</span>
+<span id="cb33-66"><a href="materialized-views-1.html#cb33-66" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
+<span id="cb33-67"><a href="materialized-views-1.html#cb33-67" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb33-68"><a href="materialized-views-1.html#cb33-68" aria-hidden="true"></a>           achilles_results.stratum_2,</span>
+<span id="cb33-69"><a href="materialized-views-1.html#cb33-69" aria-hidden="true"></a>           achilles_results.stratum_3,</span>
+<span id="cb33-70"><a href="materialized-views-1.html#cb33-70" aria-hidden="true"></a>           achilles_results.stratum_4,</span>
+<span id="cb33-71"><a href="materialized-views-1.html#cb33-71" aria-hidden="true"></a>           achilles_results.stratum_5,</span>
+<span id="cb33-72"><a href="materialized-views-1.html#cb33-72" aria-hidden="true"></a>           achilles_results.count_value,</span>
+<span id="cb33-73"><a href="materialized-views-1.html#cb33-73" aria-hidden="true"></a>           achilles_results.data_source_id,</span>
+<span id="cb33-74"><a href="materialized-views-1.html#cb33-74" aria-hidden="true"></a>           achilles_results.avg_value,</span>
+<span id="cb33-75"><a href="materialized-views-1.html#cb33-75" aria-hidden="true"></a>           achilles_results.max_value,</span>
+<span id="cb33-76"><a href="materialized-views-1.html#cb33-76" aria-hidden="true"></a>           achilles_results.median_value,</span>
+<span id="cb33-77"><a href="materialized-views-1.html#cb33-77" aria-hidden="true"></a>           achilles_results.min_value,</span>
+<span id="cb33-78"><a href="materialized-views-1.html#cb33-78" aria-hidden="true"></a>           achilles_results.p10_value,</span>
+<span id="cb33-79"><a href="materialized-views-1.html#cb33-79" aria-hidden="true"></a>           achilles_results.p25_value,</span>
+<span id="cb33-80"><a href="materialized-views-1.html#cb33-80" aria-hidden="true"></a>           achilles_results.p75_value,</span>
+<span id="cb33-81"><a href="materialized-views-1.html#cb33-81" aria-hidden="true"></a>           achilles_results.p90_value,</span>
+<span id="cb33-82"><a href="materialized-views-1.html#cb33-82" aria-hidden="true"></a>           achilles_results.stdev_value</span>
+<span id="cb33-83"><a href="materialized-views-1.html#cb33-83" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb33-84"><a href="materialized-views-1.html#cb33-84" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1</span>)) denom</span>
+<span id="cb33-85"><a href="materialized-views-1.html#cb33-85" aria-hidden="true"></a>           <span class="kw">ON</span> ((ar1.data_source_id <span class="op">=</span> denom.data_source_id)))</span>
+<span id="cb33-86"><a href="materialized-views-1.html#cb33-86" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">ON</span> ((data_source.<span class="kw">id</span> <span class="op">=</span> ar1.data_source_id)))</span>
+<span id="cb33-87"><a href="materialized-views-1.html#cb33-87" aria-hidden="true"></a>    <span class="kw">JOIN</span> country</span>
+<span id="cb33-88"><a href="materialized-views-1.html#cb33-88" aria-hidden="true"></a>      <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> data_source.country_id)))</span>
+<span id="cb33-89"><a href="materialized-views-1.html#cb33-89" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept</span>
+<span id="cb33-90"><a href="materialized-views-1.html#cb33-90" aria-hidden="true"></a>      <span class="kw">ON</span> (((ar1.stratum_1):<span class="ch">:integer</span> <span class="op">=</span> concept.concept_id)))</span>
+<span id="cb33-91"><a href="materialized-views-1.html#cb33-91" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> ar1.data_source_id, ar1.count_value <span class="kw">DESC</span>;</span></code></pre></div>
 </div>
 <div id="domain_filter" class="section level3 unnumbered" number="">
 <h3>domain_filter</h3>
-<div class="sourceCode" id="cb35"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb35-1"><a href="materialized-views-1.html#cb35-1" aria-hidden="true"></a><span class="kw">SELECT</span> concept.concept_name,</span>
-<span id="cb35-2"><a href="materialized-views-1.html#cb35-2" aria-hidden="true"></a>   concept.domain_id,</span>
-<span id="cb35-3"><a href="materialized-views-1.html#cb35-3" aria-hidden="true"></a>   <span class="kw">source</span>.name,</span>
-<span id="cb35-4"><a href="materialized-views-1.html#cb35-4" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb35-5"><a href="materialized-views-1.html#cb35-5" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
-<span id="cb35-6"><a href="materialized-views-1.html#cb35-6" aria-hidden="true"></a>   country.country</span>
-<span id="cb35-7"><a href="materialized-views-1.html#cb35-7" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results</span>
-<span id="cb35-8"><a href="materialized-views-1.html#cb35-8" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept <span class="kw">ON</span> (((achilles_results.stratum_1):<span class="ch">:bigint</span> <span class="op">=</span> concept.concept_id)))</span>
-<span id="cb35-9"><a href="materialized-views-1.html#cb35-9" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles_results.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb35-10"><a href="materialized-views-1.html#cb35-10" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
-<span id="cb35-11"><a href="materialized-views-1.html#cb35-11" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">201</span>):<span class="ch">:bigint</span>, (<span class="dv">401</span>):<span class="ch">:bigint</span>, (<span class="dv">601</span>):<span class="ch">:bigint</span>, (<span class="dv">701</span>):<span class="ch">:bigint</span>, (<span class="dv">801</span>):<span class="ch">:bigint</span>, (<span class="dv">901</span>):<span class="ch">:bigint</span>, (<span class="dv">1001</span>):<span class="ch">:bigint</span>, (<span class="dv">1801</span>):<span class="ch">:bigint</span>, (<span class="dv">200</span>):<span class="ch">:bigint</span>, (<span class="dv">400</span>):<span class="ch">:bigint</span>, (<span class="dv">600</span>):<span class="ch">:bigint</span>, (<span class="dv">700</span>):<span class="ch">:bigint</span>, (<span class="dv">800</span>):<span class="ch">:bigint</span>, (<span class="dv">1800</span>):<span class="ch">:bigint</span>]));</span></code></pre></div>
+<div class="sourceCode" id="cb34"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb34-1"><a href="materialized-views-1.html#cb34-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
+<span id="cb34-2"><a href="materialized-views-1.html#cb34-2" aria-hidden="true"></a>  concept.concept_name,</span>
+<span id="cb34-3"><a href="materialized-views-1.html#cb34-3" aria-hidden="true"></a>  concept.domain_id,</span>
+<span id="cb34-4"><a href="materialized-views-1.html#cb34-4" aria-hidden="true"></a>  <span class="kw">source</span>.name,</span>
+<span id="cb34-5"><a href="materialized-views-1.html#cb34-5" aria-hidden="true"></a>  <span class="kw">source</span>.acronym,</span>
+<span id="cb34-6"><a href="materialized-views-1.html#cb34-6" aria-hidden="true"></a>  <span class="kw">source</span>.database_type,</span>
+<span id="cb34-7"><a href="materialized-views-1.html#cb34-7" aria-hidden="true"></a>  country.country</span>
+<span id="cb34-8"><a href="materialized-views-1.html#cb34-8" aria-hidden="true"></a><span class="kw">FROM</span></span>
+<span id="cb34-9"><a href="materialized-views-1.html#cb34-9" aria-hidden="true"></a>  (</span>
+<span id="cb34-10"><a href="materialized-views-1.html#cb34-10" aria-hidden="true"></a>    (</span>
+<span id="cb34-11"><a href="materialized-views-1.html#cb34-11" aria-hidden="true"></a>      (</span>
+<span id="cb34-12"><a href="materialized-views-1.html#cb34-12" aria-hidden="true"></a>        achilles_results</span>
+<span id="cb34-13"><a href="materialized-views-1.html#cb34-13" aria-hidden="true"></a>        <span class="kw">JOIN</span> concept <span class="kw">ON</span> (</span>
+<span id="cb34-14"><a href="materialized-views-1.html#cb34-14" aria-hidden="true"></a>          (</span>
+<span id="cb34-15"><a href="materialized-views-1.html#cb34-15" aria-hidden="true"></a>            (achilles_results.stratum_1):: bigint</span>
+<span id="cb34-16"><a href="materialized-views-1.html#cb34-16" aria-hidden="true"></a>            <span class="op">=</span></span>
+<span id="cb34-17"><a href="materialized-views-1.html#cb34-17" aria-hidden="true"></a>            concept.concept_id</span>
+<span id="cb34-18"><a href="materialized-views-1.html#cb34-18" aria-hidden="true"></a>          )</span>
+<span id="cb34-19"><a href="materialized-views-1.html#cb34-19" aria-hidden="true"></a>        )</span>
+<span id="cb34-20"><a href="materialized-views-1.html#cb34-20" aria-hidden="true"></a>      )</span>
+<span id="cb34-21"><a href="materialized-views-1.html#cb34-21" aria-hidden="true"></a>      <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> (</span>
+<span id="cb34-22"><a href="materialized-views-1.html#cb34-22" aria-hidden="true"></a>        (</span>
+<span id="cb34-23"><a href="materialized-views-1.html#cb34-23" aria-hidden="true"></a>          achilles_results.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb34-24"><a href="materialized-views-1.html#cb34-24" aria-hidden="true"></a>        )</span>
+<span id="cb34-25"><a href="materialized-views-1.html#cb34-25" aria-hidden="true"></a>      )</span>
+<span id="cb34-26"><a href="materialized-views-1.html#cb34-26" aria-hidden="true"></a>    )</span>
+<span id="cb34-27"><a href="materialized-views-1.html#cb34-27" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> (</span>
+<span id="cb34-28"><a href="materialized-views-1.html#cb34-28" aria-hidden="true"></a>      (country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)</span>
+<span id="cb34-29"><a href="materialized-views-1.html#cb34-29" aria-hidden="true"></a>    )</span>
+<span id="cb34-30"><a href="materialized-views-1.html#cb34-30" aria-hidden="true"></a>  )</span>
+<span id="cb34-31"><a href="materialized-views-1.html#cb34-31" aria-hidden="true"></a><span class="kw">WHERE</span></span>
+<span id="cb34-32"><a href="materialized-views-1.html#cb34-32" aria-hidden="true"></a>  (</span>
+<span id="cb34-33"><a href="materialized-views-1.html#cb34-33" aria-hidden="true"></a>    achilles_results.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb34-34"><a href="materialized-views-1.html#cb34-34" aria-hidden="true"></a>      <span class="dt">ARRAY</span>[(<span class="dv">201</span>):: bigint,</span>
+<span id="cb34-35"><a href="materialized-views-1.html#cb34-35" aria-hidden="true"></a>      (<span class="dv">401</span>):: bigint,</span>
+<span id="cb34-36"><a href="materialized-views-1.html#cb34-36" aria-hidden="true"></a>      (<span class="dv">601</span>):: bigint,</span>
+<span id="cb34-37"><a href="materialized-views-1.html#cb34-37" aria-hidden="true"></a>      (<span class="dv">701</span>):: bigint,</span>
+<span id="cb34-38"><a href="materialized-views-1.html#cb34-38" aria-hidden="true"></a>      (<span class="dv">801</span>):: bigint,</span>
+<span id="cb34-39"><a href="materialized-views-1.html#cb34-39" aria-hidden="true"></a>      (<span class="dv">901</span>):: bigint,</span>
+<span id="cb34-40"><a href="materialized-views-1.html#cb34-40" aria-hidden="true"></a>      (<span class="dv">1001</span>):: bigint,</span>
+<span id="cb34-41"><a href="materialized-views-1.html#cb34-41" aria-hidden="true"></a>      (<span class="dv">1801</span>):: bigint,</span>
+<span id="cb34-42"><a href="materialized-views-1.html#cb34-42" aria-hidden="true"></a>      (<span class="dv">200</span>):: bigint,</span>
+<span id="cb34-43"><a href="materialized-views-1.html#cb34-43" aria-hidden="true"></a>      (<span class="dv">400</span>):: bigint,</span>
+<span id="cb34-44"><a href="materialized-views-1.html#cb34-44" aria-hidden="true"></a>      (<span class="dv">600</span>):: bigint,</span>
+<span id="cb34-45"><a href="materialized-views-1.html#cb34-45" aria-hidden="true"></a>      (<span class="dv">700</span>):: bigint,</span>
+<span id="cb34-46"><a href="materialized-views-1.html#cb34-46" aria-hidden="true"></a>      (<span class="dv">800</span>):: bigint,</span>
+<span id="cb34-47"><a href="materialized-views-1.html#cb34-47" aria-hidden="true"></a>      (<span class="dv">1800</span>):: bigint]</span>
+<span id="cb34-48"><a href="materialized-views-1.html#cb34-48" aria-hidden="true"></a>    )</span>
+<span id="cb34-49"><a href="materialized-views-1.html#cb34-49" aria-hidden="true"></a>  );</span></code></pre></div>
 </div>
 <div id="concept_browser_table3" class="section level3 unnumbered" number="">
 <h3>concept_browser_table3</h3>
-<div class="sourceCode" id="cb36"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb36-1"><a href="materialized-views-1.html#cb36-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb36-2"><a href="materialized-views-1.html#cb36-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb36-3"><a href="materialized-views-1.html#cb36-3" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
-<span id="cb36-4"><a href="materialized-views-1.html#cb36-4" aria-hidden="true"></a>   country.country,</span>
-<span id="cb36-5"><a href="materialized-views-1.html#cb36-5" aria-hidden="true"></a>   ((((<span class="st">&#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39;</span>:<span class="ch">:text</span> <span class="op">||</span> ar1.concept_id) <span class="op">||</span> <span class="st">&#39;&quot;target=&quot;_blank&quot;&gt;&#39;</span>:<span class="ch">:text</span>) <span class="op">||</span> ar1.concept_id) <span class="op">||</span> <span class="st">&#39;&lt;/a&gt;&#39;</span>:<span class="ch">:text</span>) <span class="kw">AS</span> concept_id,</span>
-<span id="cb36-6"><a href="materialized-views-1.html#cb36-6" aria-hidden="true"></a>   concept.concept_name,</span>
-<span id="cb36-7"><a href="materialized-views-1.html#cb36-7" aria-hidden="true"></a>   concept.domain_id,</span>
-<span id="cb36-8"><a href="materialized-views-1.html#cb36-8" aria-hidden="true"></a>   (ar1.rc):<span class="ch">:integer</span> <span class="kw">AS</span> rc,</span>
-<span id="cb36-9"><a href="materialized-views-1.html#cb36-9" aria-hidden="true"></a>   (ar2.drc):<span class="ch">:integer</span> <span class="kw">AS</span> drc</span>
-<span id="cb36-10"><a href="materialized-views-1.html#cb36-10" aria-hidden="true"></a>  <span class="kw">FROM</span> ((((( <span class="kw">SELECT</span> achilles_results.data_source_id,</span>
-<span id="cb36-11"><a href="materialized-views-1.html#cb36-11" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
-<span id="cb36-12"><a href="materialized-views-1.html#cb36-12" aria-hidden="true"></a>           achilles_results.stratum_1 <span class="kw">AS</span> concept_id,</span>
-<span id="cb36-13"><a href="materialized-views-1.html#cb36-13" aria-hidden="true"></a>           achilles_results.count_value <span class="kw">AS</span> rc</span>
-<span id="cb36-14"><a href="materialized-views-1.html#cb36-14" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb36-15"><a href="materialized-views-1.html#cb36-15" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">401</span>):<span class="ch">:bigint</span>, (<span class="dv">601</span>):<span class="ch">:bigint</span>, (<span class="dv">701</span>):<span class="ch">:bigint</span>, (<span class="dv">801</span>):<span class="ch">:bigint</span>, (<span class="dv">1801</span>):<span class="ch">:bigint</span>, (<span class="dv">2101</span>):<span class="ch">:bigint</span>]))) ar1</span>
-<span id="cb36-16"><a href="materialized-views-1.html#cb36-16" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> ar.data_source_id,</span>
-<span id="cb36-17"><a href="materialized-views-1.html#cb36-17" aria-hidden="true"></a>           ar.analysis_id,</span>
-<span id="cb36-18"><a href="materialized-views-1.html#cb36-18" aria-hidden="true"></a>           ar.stratum_1 <span class="kw">AS</span> concept_id,</span>
-<span id="cb36-19"><a href="materialized-views-1.html#cb36-19" aria-hidden="true"></a>           ar.count_value <span class="kw">AS</span> drc</span>
-<span id="cb36-20"><a href="materialized-views-1.html#cb36-20" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results ar</span>
-<span id="cb36-21"><a href="materialized-views-1.html#cb36-21" aria-hidden="true"></a>         <span class="kw">WHERE</span> (ar.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">430</span>):<span class="ch">:bigint</span>, (<span class="dv">630</span>):<span class="ch">:bigint</span>, (<span class="dv">730</span>):<span class="ch">:bigint</span>, (<span class="dv">830</span>):<span class="ch">:bigint</span>, (<span class="dv">1830</span>):<span class="ch">:bigint</span>, (<span class="dv">2130</span>):<span class="ch">:bigint</span>]))) ar2 <span class="kw">ON</span> (((ar1.concept_id <span class="op">=</span> ar2.concept_id) <span class="kw">AND</span> (ar1.data_source_id <span class="op">=</span> ar2.data_source_id))))</span>
-<span id="cb36-22"><a href="materialized-views-1.html#cb36-22" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((ar1.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb36-23"><a href="materialized-views-1.html#cb36-23" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((<span class="kw">source</span>.country_id <span class="op">=</span> country.<span class="kw">id</span>)))</span>
-<span id="cb36-24"><a href="materialized-views-1.html#cb36-24" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept concept <span class="kw">ON</span> ((ar1.concept_id <span class="op">=</span> (concept.concept_id):<span class="ch">:text</span>)))</span>
-<span id="cb36-25"><a href="materialized-views-1.html#cb36-25" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> ((ar2.drc):<span class="ch">:integer</span>) <span class="kw">DESC</span>;</span></code></pre></div>
+<div class="sourceCode" id="cb35"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb35-1"><a href="materialized-views-1.html#cb35-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
+<span id="cb35-2"><a href="materialized-views-1.html#cb35-2" aria-hidden="true"></a>  <span class="kw">source</span>.name,</span>
+<span id="cb35-3"><a href="materialized-views-1.html#cb35-3" aria-hidden="true"></a>  <span class="kw">source</span>.acronym,</span>
+<span id="cb35-4"><a href="materialized-views-1.html#cb35-4" aria-hidden="true"></a>  <span class="kw">source</span>.database_type,</span>
+<span id="cb35-5"><a href="materialized-views-1.html#cb35-5" aria-hidden="true"></a>  country.country,</span>
+<span id="cb35-6"><a href="materialized-views-1.html#cb35-6" aria-hidden="true"></a>  (</span>
+<span id="cb35-7"><a href="materialized-views-1.html#cb35-7" aria-hidden="true"></a>    (</span>
+<span id="cb35-8"><a href="materialized-views-1.html#cb35-8" aria-hidden="true"></a>      (</span>
+<span id="cb35-9"><a href="materialized-views-1.html#cb35-9" aria-hidden="true"></a>        (</span>
+<span id="cb35-10"><a href="materialized-views-1.html#cb35-10" aria-hidden="true"></a><span class="st">&#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39;</span> :: text</span>
+<span id="cb35-11"><a href="materialized-views-1.html#cb35-11" aria-hidden="true"></a>          <span class="op">||</span> ar1.concept_id</span>
+<span id="cb35-12"><a href="materialized-views-1.html#cb35-12" aria-hidden="true"></a>        ) <span class="op">||</span> <span class="st">&#39;&quot;target=&quot;_blank&quot;&gt;&#39;</span> :: text</span>
+<span id="cb35-13"><a href="materialized-views-1.html#cb35-13" aria-hidden="true"></a>      ) <span class="op">||</span> ar1.concept_id</span>
+<span id="cb35-14"><a href="materialized-views-1.html#cb35-14" aria-hidden="true"></a>    ) <span class="op">||</span> <span class="st">&#39;&lt;/a&gt;&#39;</span> :: text</span>
+<span id="cb35-15"><a href="materialized-views-1.html#cb35-15" aria-hidden="true"></a>  ) <span class="kw">AS</span> concept_id,</span>
+<span id="cb35-16"><a href="materialized-views-1.html#cb35-16" aria-hidden="true"></a>  concept.concept_name,</span>
+<span id="cb35-17"><a href="materialized-views-1.html#cb35-17" aria-hidden="true"></a>  concept.domain_id,</span>
+<span id="cb35-18"><a href="materialized-views-1.html#cb35-18" aria-hidden="true"></a>  (ar1.rc):: <span class="dt">integer</span> <span class="kw">AS</span> rc,</span>
+<span id="cb35-19"><a href="materialized-views-1.html#cb35-19" aria-hidden="true"></a>  (ar2.drc):: <span class="dt">integer</span> <span class="kw">AS</span> drc</span>
+<span id="cb35-20"><a href="materialized-views-1.html#cb35-20" aria-hidden="true"></a><span class="kw">FROM</span></span>
+<span id="cb35-21"><a href="materialized-views-1.html#cb35-21" aria-hidden="true"></a>  (</span>
+<span id="cb35-22"><a href="materialized-views-1.html#cb35-22" aria-hidden="true"></a>    (</span>
+<span id="cb35-23"><a href="materialized-views-1.html#cb35-23" aria-hidden="true"></a>      (</span>
+<span id="cb35-24"><a href="materialized-views-1.html#cb35-24" aria-hidden="true"></a>        (</span>
+<span id="cb35-25"><a href="materialized-views-1.html#cb35-25" aria-hidden="true"></a>          (</span>
+<span id="cb35-26"><a href="materialized-views-1.html#cb35-26" aria-hidden="true"></a>            <span class="kw">SELECT</span></span>
+<span id="cb35-27"><a href="materialized-views-1.html#cb35-27" aria-hidden="true"></a>              achilles_results.data_source_id,</span>
+<span id="cb35-28"><a href="materialized-views-1.html#cb35-28" aria-hidden="true"></a>              achilles_results.analysis_id,</span>
+<span id="cb35-29"><a href="materialized-views-1.html#cb35-29" aria-hidden="true"></a>              achilles_results.stratum_1 <span class="kw">AS</span> concept_id,</span>
+<span id="cb35-30"><a href="materialized-views-1.html#cb35-30" aria-hidden="true"></a>              achilles_results.count_value <span class="kw">AS</span> rc</span>
+<span id="cb35-31"><a href="materialized-views-1.html#cb35-31" aria-hidden="true"></a>            <span class="kw">FROM</span></span>
+<span id="cb35-32"><a href="materialized-views-1.html#cb35-32" aria-hidden="true"></a>              achilles_results</span>
+<span id="cb35-33"><a href="materialized-views-1.html#cb35-33" aria-hidden="true"></a>            <span class="kw">WHERE</span></span>
+<span id="cb35-34"><a href="materialized-views-1.html#cb35-34" aria-hidden="true"></a>              (</span>
+<span id="cb35-35"><a href="materialized-views-1.html#cb35-35" aria-hidden="true"></a>                achilles_results.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb35-36"><a href="materialized-views-1.html#cb35-36" aria-hidden="true"></a>                  <span class="dt">ARRAY</span>[(<span class="dv">401</span>):: bigint,</span>
+<span id="cb35-37"><a href="materialized-views-1.html#cb35-37" aria-hidden="true"></a>                  (<span class="dv">601</span>):: bigint,</span>
+<span id="cb35-38"><a href="materialized-views-1.html#cb35-38" aria-hidden="true"></a>                  (<span class="dv">701</span>):: bigint,</span>
+<span id="cb35-39"><a href="materialized-views-1.html#cb35-39" aria-hidden="true"></a>                  (<span class="dv">801</span>):: bigint,</span>
+<span id="cb35-40"><a href="materialized-views-1.html#cb35-40" aria-hidden="true"></a>                  (<span class="dv">1801</span>):: bigint,</span>
+<span id="cb35-41"><a href="materialized-views-1.html#cb35-41" aria-hidden="true"></a>                  (<span class="dv">2101</span>):: bigint]</span>
+<span id="cb35-42"><a href="materialized-views-1.html#cb35-42" aria-hidden="true"></a>                )</span>
+<span id="cb35-43"><a href="materialized-views-1.html#cb35-43" aria-hidden="true"></a>              )</span>
+<span id="cb35-44"><a href="materialized-views-1.html#cb35-44" aria-hidden="true"></a>          ) ar1</span>
+<span id="cb35-45"><a href="materialized-views-1.html#cb35-45" aria-hidden="true"></a>          <span class="kw">JOIN</span> (</span>
+<span id="cb35-46"><a href="materialized-views-1.html#cb35-46" aria-hidden="true"></a>            <span class="kw">SELECT</span></span>
+<span id="cb35-47"><a href="materialized-views-1.html#cb35-47" aria-hidden="true"></a>              ar.data_source_id,</span>
+<span id="cb35-48"><a href="materialized-views-1.html#cb35-48" aria-hidden="true"></a>              ar.analysis_id,</span>
+<span id="cb35-49"><a href="materialized-views-1.html#cb35-49" aria-hidden="true"></a>              ar.stratum_1 <span class="kw">AS</span> concept_id,</span>
+<span id="cb35-50"><a href="materialized-views-1.html#cb35-50" aria-hidden="true"></a>              ar.count_value <span class="kw">AS</span> drc</span>
+<span id="cb35-51"><a href="materialized-views-1.html#cb35-51" aria-hidden="true"></a>            <span class="kw">FROM</span></span>
+<span id="cb35-52"><a href="materialized-views-1.html#cb35-52" aria-hidden="true"></a>              achilles_results ar</span>
+<span id="cb35-53"><a href="materialized-views-1.html#cb35-53" aria-hidden="true"></a>            <span class="kw">WHERE</span></span>
+<span id="cb35-54"><a href="materialized-views-1.html#cb35-54" aria-hidden="true"></a>              (</span>
+<span id="cb35-55"><a href="materialized-views-1.html#cb35-55" aria-hidden="true"></a>                ar.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb35-56"><a href="materialized-views-1.html#cb35-56" aria-hidden="true"></a>                  <span class="dt">ARRAY</span>[(<span class="dv">430</span>):: bigint,</span>
+<span id="cb35-57"><a href="materialized-views-1.html#cb35-57" aria-hidden="true"></a>                  (<span class="dv">630</span>):: bigint,</span>
+<span id="cb35-58"><a href="materialized-views-1.html#cb35-58" aria-hidden="true"></a>                  (<span class="dv">730</span>):: bigint,</span>
+<span id="cb35-59"><a href="materialized-views-1.html#cb35-59" aria-hidden="true"></a>                  (<span class="dv">830</span>):: bigint,</span>
+<span id="cb35-60"><a href="materialized-views-1.html#cb35-60" aria-hidden="true"></a>                  (<span class="dv">1830</span>):: bigint,</span>
+<span id="cb35-61"><a href="materialized-views-1.html#cb35-61" aria-hidden="true"></a>                  (<span class="dv">2130</span>):: bigint]</span>
+<span id="cb35-62"><a href="materialized-views-1.html#cb35-62" aria-hidden="true"></a>                )</span>
+<span id="cb35-63"><a href="materialized-views-1.html#cb35-63" aria-hidden="true"></a>              )</span>
+<span id="cb35-64"><a href="materialized-views-1.html#cb35-64" aria-hidden="true"></a>          ) ar2 <span class="kw">ON</span> (</span>
+<span id="cb35-65"><a href="materialized-views-1.html#cb35-65" aria-hidden="true"></a>            (</span>
+<span id="cb35-66"><a href="materialized-views-1.html#cb35-66" aria-hidden="true"></a>              (ar1.concept_id <span class="op">=</span> ar2.concept_id)</span>
+<span id="cb35-67"><a href="materialized-views-1.html#cb35-67" aria-hidden="true"></a>              <span class="kw">AND</span> (</span>
+<span id="cb35-68"><a href="materialized-views-1.html#cb35-68" aria-hidden="true"></a>                ar1.data_source_id <span class="op">=</span> ar2.data_source_id</span>
+<span id="cb35-69"><a href="materialized-views-1.html#cb35-69" aria-hidden="true"></a>              )</span>
+<span id="cb35-70"><a href="materialized-views-1.html#cb35-70" aria-hidden="true"></a>            )</span>
+<span id="cb35-71"><a href="materialized-views-1.html#cb35-71" aria-hidden="true"></a>          )</span>
+<span id="cb35-72"><a href="materialized-views-1.html#cb35-72" aria-hidden="true"></a>        )</span>
+<span id="cb35-73"><a href="materialized-views-1.html#cb35-73" aria-hidden="true"></a>        <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> (</span>
+<span id="cb35-74"><a href="materialized-views-1.html#cb35-74" aria-hidden="true"></a>          (ar1.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)</span>
+<span id="cb35-75"><a href="materialized-views-1.html#cb35-75" aria-hidden="true"></a>        )</span>
+<span id="cb35-76"><a href="materialized-views-1.html#cb35-76" aria-hidden="true"></a>      )</span>
+<span id="cb35-77"><a href="materialized-views-1.html#cb35-77" aria-hidden="true"></a>      <span class="kw">JOIN</span> country <span class="kw">ON</span> (</span>
+<span id="cb35-78"><a href="materialized-views-1.html#cb35-78" aria-hidden="true"></a>        (<span class="kw">source</span>.country_id <span class="op">=</span> country.<span class="kw">id</span>)</span>
+<span id="cb35-79"><a href="materialized-views-1.html#cb35-79" aria-hidden="true"></a>      )</span>
+<span id="cb35-80"><a href="materialized-views-1.html#cb35-80" aria-hidden="true"></a>    )</span>
+<span id="cb35-81"><a href="materialized-views-1.html#cb35-81" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept concept <span class="kw">ON</span> (</span>
+<span id="cb35-82"><a href="materialized-views-1.html#cb35-82" aria-hidden="true"></a>      (</span>
+<span id="cb35-83"><a href="materialized-views-1.html#cb35-83" aria-hidden="true"></a>        ar1.concept_id <span class="op">=</span> (concept.concept_id):: text</span>
+<span id="cb35-84"><a href="materialized-views-1.html#cb35-84" aria-hidden="true"></a>      )</span>
+<span id="cb35-85"><a href="materialized-views-1.html#cb35-85" aria-hidden="true"></a>    )</span>
+<span id="cb35-86"><a href="materialized-views-1.html#cb35-86" aria-hidden="true"></a>  )</span>
+<span id="cb35-87"><a href="materialized-views-1.html#cb35-87" aria-hidden="true"></a><span class="kw">ORDER</span> <span class="kw">BY</span></span>
+<span id="cb35-88"><a href="materialized-views-1.html#cb35-88" aria-hidden="true"></a>  (</span>
+<span id="cb35-89"><a href="materialized-views-1.html#cb35-89" aria-hidden="true"></a>    (ar2.drc):: <span class="dt">integer</span></span>
+<span id="cb35-90"><a href="materialized-views-1.html#cb35-90" aria-hidden="true"></a>  ) <span class="kw">DESC</span>;</span></code></pre></div>
 </div>
 <div id="concept_coverage2" class="section level3 unnumbered" number="">
 <h3>concept_coverage2</h3>
-<div class="sourceCode" id="cb37"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb37-1"><a href="materialized-views-1.html#cb37-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name <span class="kw">AS</span> source_name,</span>
-<span id="cb37-2"><a href="materialized-views-1.html#cb37-2" aria-hidden="true"></a>   <span class="kw">source</span>.database_type,</span>
-<span id="cb37-3"><a href="materialized-views-1.html#cb37-3" aria-hidden="true"></a>   country.country,</span>
-<span id="cb37-4"><a href="materialized-views-1.html#cb37-4" aria-hidden="true"></a>   ((((<span class="st">&#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39;</span>:<span class="ch">:text</span> <span class="op">||</span> concept.concept_id) <span class="op">||</span> <span class="st">&#39;&quot; target=&quot;_blank&quot;&gt;&#39;</span>:<span class="ch">:text</span>) <span class="op">||</span> concept.concept_id) <span class="op">||</span> <span class="st">&#39;&lt;/a&gt;&#39;</span>:<span class="ch">:text</span>) <span class="kw">AS</span> concept_id,</span>
-<span id="cb37-5"><a href="materialized-views-1.html#cb37-5" aria-hidden="true"></a>   concept.concept_name,</span>
-<span id="cb37-6"><a href="materialized-views-1.html#cb37-6" aria-hidden="true"></a>   concept.domain_id,</span>
-<span id="cb37-7"><a href="materialized-views-1.html#cb37-7" aria-hidden="true"></a>   <span class="fu">sum</span>((ar1.rc):<span class="ch">:integer</span>) <span class="kw">AS</span> rc,</span>
-<span id="cb37-8"><a href="materialized-views-1.html#cb37-8" aria-hidden="true"></a>   <span class="fu">sum</span>((ar2.drc):<span class="ch">:integer</span>) <span class="kw">AS</span> drc</span>
-<span id="cb37-9"><a href="materialized-views-1.html#cb37-9" aria-hidden="true"></a>  <span class="kw">FROM</span> ((((( <span class="kw">SELECT</span> achilles_results.data_source_id,</span>
-<span id="cb37-10"><a href="materialized-views-1.html#cb37-10" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
-<span id="cb37-11"><a href="materialized-views-1.html#cb37-11" aria-hidden="true"></a>           achilles_results.stratum_1 <span class="kw">AS</span> concept_id,</span>
-<span id="cb37-12"><a href="materialized-views-1.html#cb37-12" aria-hidden="true"></a>           achilles_results.count_value <span class="kw">AS</span> rc</span>
-<span id="cb37-13"><a href="materialized-views-1.html#cb37-13" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb37-14"><a href="materialized-views-1.html#cb37-14" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">401</span>):<span class="ch">:bigint</span>, (<span class="dv">601</span>):<span class="ch">:bigint</span>, (<span class="dv">701</span>):<span class="ch">:bigint</span>, (<span class="dv">801</span>):<span class="ch">:bigint</span>, (<span class="dv">1801</span>):<span class="ch">:bigint</span>, (<span class="dv">2101</span>):<span class="ch">:bigint</span>]))) ar1</span>
-<span id="cb37-15"><a href="materialized-views-1.html#cb37-15" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> ar.data_source_id,</span>
-<span id="cb37-16"><a href="materialized-views-1.html#cb37-16" aria-hidden="true"></a>           ar.analysis_id,</span>
-<span id="cb37-17"><a href="materialized-views-1.html#cb37-17" aria-hidden="true"></a>           ar.stratum_1 <span class="kw">AS</span> concept_id,</span>
-<span id="cb37-18"><a href="materialized-views-1.html#cb37-18" aria-hidden="true"></a>           ar.count_value <span class="kw">AS</span> drc</span>
-<span id="cb37-19"><a href="materialized-views-1.html#cb37-19" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results ar</span>
-<span id="cb37-20"><a href="materialized-views-1.html#cb37-20" aria-hidden="true"></a>         <span class="kw">WHERE</span> (ar.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">430</span>):<span class="ch">:bigint</span>, (<span class="dv">630</span>):<span class="ch">:bigint</span>, (<span class="dv">730</span>):<span class="ch">:bigint</span>, (<span class="dv">830</span>):<span class="ch">:bigint</span>, (<span class="dv">1830</span>):<span class="ch">:bigint</span>, (<span class="dv">2130</span>):<span class="ch">:bigint</span>]))) ar2 <span class="kw">ON</span> (((ar1.concept_id <span class="op">=</span> ar2.concept_id) <span class="kw">AND</span> (ar1.data_source_id <span class="op">=</span> ar2.data_source_id))))</span>
-<span id="cb37-21"><a href="materialized-views-1.html#cb37-21" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((ar1.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb37-22"><a href="materialized-views-1.html#cb37-22" aria-hidden="true"></a>    <span class="kw">JOIN</span> country <span class="kw">ON</span> ((country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)))</span>
-<span id="cb37-23"><a href="materialized-views-1.html#cb37-23" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept concept <span class="kw">ON</span> ((ar1.concept_id <span class="op">=</span> (concept.concept_id):<span class="ch">:text</span>)))</span>
-<span id="cb37-24"><a href="materialized-views-1.html#cb37-24" aria-hidden="true"></a> <span class="kw">GROUP</span> <span class="kw">BY</span> <span class="kw">source</span>.name, <span class="kw">source</span>.database_type, country.country, concept.domain_id, concept.concept_id, concept.concept_name;</span></code></pre></div>
+<div class="sourceCode" id="cb36"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb36-1"><a href="materialized-views-1.html#cb36-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
+<span id="cb36-2"><a href="materialized-views-1.html#cb36-2" aria-hidden="true"></a>  <span class="kw">source</span>.name <span class="kw">AS</span> source_name,</span>
+<span id="cb36-3"><a href="materialized-views-1.html#cb36-3" aria-hidden="true"></a>  <span class="kw">source</span>.database_type,</span>
+<span id="cb36-4"><a href="materialized-views-1.html#cb36-4" aria-hidden="true"></a>  country.country,</span>
+<span id="cb36-5"><a href="materialized-views-1.html#cb36-5" aria-hidden="true"></a>  (</span>
+<span id="cb36-6"><a href="materialized-views-1.html#cb36-6" aria-hidden="true"></a>    (</span>
+<span id="cb36-7"><a href="materialized-views-1.html#cb36-7" aria-hidden="true"></a>      (</span>
+<span id="cb36-8"><a href="materialized-views-1.html#cb36-8" aria-hidden="true"></a>        (</span>
+<span id="cb36-9"><a href="materialized-views-1.html#cb36-9" aria-hidden="true"></a><span class="st">&#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39;</span> :: text</span>
+<span id="cb36-10"><a href="materialized-views-1.html#cb36-10" aria-hidden="true"></a>          <span class="op">||</span> concept.concept_id</span>
+<span id="cb36-11"><a href="materialized-views-1.html#cb36-11" aria-hidden="true"></a>        ) <span class="op">||</span> <span class="st">&#39;&quot; target=&quot;_blank&quot;&gt;&#39;</span> :: text</span>
+<span id="cb36-12"><a href="materialized-views-1.html#cb36-12" aria-hidden="true"></a>      ) <span class="op">||</span> concept.concept_id</span>
+<span id="cb36-13"><a href="materialized-views-1.html#cb36-13" aria-hidden="true"></a>    ) <span class="op">||</span> <span class="st">&#39;&lt;/a&gt;&#39;</span> :: text</span>
+<span id="cb36-14"><a href="materialized-views-1.html#cb36-14" aria-hidden="true"></a>  ) <span class="kw">AS</span> concept_id,</span>
+<span id="cb36-15"><a href="materialized-views-1.html#cb36-15" aria-hidden="true"></a>  concept.concept_name,</span>
+<span id="cb36-16"><a href="materialized-views-1.html#cb36-16" aria-hidden="true"></a>  concept.domain_id,</span>
+<span id="cb36-17"><a href="materialized-views-1.html#cb36-17" aria-hidden="true"></a>  <span class="fu">sum</span>(</span>
+<span id="cb36-18"><a href="materialized-views-1.html#cb36-18" aria-hidden="true"></a>    (ar1.rc):: <span class="dt">integer</span></span>
+<span id="cb36-19"><a href="materialized-views-1.html#cb36-19" aria-hidden="true"></a>  ) <span class="kw">AS</span> rc,</span>
+<span id="cb36-20"><a href="materialized-views-1.html#cb36-20" aria-hidden="true"></a>  <span class="fu">sum</span>(</span>
+<span id="cb36-21"><a href="materialized-views-1.html#cb36-21" aria-hidden="true"></a>    (ar2.drc):: <span class="dt">integer</span></span>
+<span id="cb36-22"><a href="materialized-views-1.html#cb36-22" aria-hidden="true"></a>  ) <span class="kw">AS</span> drc</span>
+<span id="cb36-23"><a href="materialized-views-1.html#cb36-23" aria-hidden="true"></a><span class="kw">FROM</span></span>
+<span id="cb36-24"><a href="materialized-views-1.html#cb36-24" aria-hidden="true"></a>  (</span>
+<span id="cb36-25"><a href="materialized-views-1.html#cb36-25" aria-hidden="true"></a>    (</span>
+<span id="cb36-26"><a href="materialized-views-1.html#cb36-26" aria-hidden="true"></a>      (</span>
+<span id="cb36-27"><a href="materialized-views-1.html#cb36-27" aria-hidden="true"></a>        (</span>
+<span id="cb36-28"><a href="materialized-views-1.html#cb36-28" aria-hidden="true"></a>          (</span>
+<span id="cb36-29"><a href="materialized-views-1.html#cb36-29" aria-hidden="true"></a>            <span class="kw">SELECT</span></span>
+<span id="cb36-30"><a href="materialized-views-1.html#cb36-30" aria-hidden="true"></a>              achilles_results.data_source_id,</span>
+<span id="cb36-31"><a href="materialized-views-1.html#cb36-31" aria-hidden="true"></a>              achilles_results.analysis_id,</span>
+<span id="cb36-32"><a href="materialized-views-1.html#cb36-32" aria-hidden="true"></a>              achilles_results.stratum_1 <span class="kw">AS</span> concept_id,</span>
+<span id="cb36-33"><a href="materialized-views-1.html#cb36-33" aria-hidden="true"></a>              achilles_results.count_value <span class="kw">AS</span> rc</span>
+<span id="cb36-34"><a href="materialized-views-1.html#cb36-34" aria-hidden="true"></a>            <span class="kw">FROM</span></span>
+<span id="cb36-35"><a href="materialized-views-1.html#cb36-35" aria-hidden="true"></a>              achilles_results</span>
+<span id="cb36-36"><a href="materialized-views-1.html#cb36-36" aria-hidden="true"></a>            <span class="kw">WHERE</span></span>
+<span id="cb36-37"><a href="materialized-views-1.html#cb36-37" aria-hidden="true"></a>              (</span>
+<span id="cb36-38"><a href="materialized-views-1.html#cb36-38" aria-hidden="true"></a>                achilles_results.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb36-39"><a href="materialized-views-1.html#cb36-39" aria-hidden="true"></a>                  <span class="dt">ARRAY</span>[(<span class="dv">401</span>):: bigint,</span>
+<span id="cb36-40"><a href="materialized-views-1.html#cb36-40" aria-hidden="true"></a>                  (<span class="dv">601</span>):: bigint,</span>
+<span id="cb36-41"><a href="materialized-views-1.html#cb36-41" aria-hidden="true"></a>                  (<span class="dv">701</span>):: bigint,</span>
+<span id="cb36-42"><a href="materialized-views-1.html#cb36-42" aria-hidden="true"></a>                  (<span class="dv">801</span>):: bigint,</span>
+<span id="cb36-43"><a href="materialized-views-1.html#cb36-43" aria-hidden="true"></a>                  (<span class="dv">1801</span>):: bigint,</span>
+<span id="cb36-44"><a href="materialized-views-1.html#cb36-44" aria-hidden="true"></a>                  (<span class="dv">2101</span>):: bigint]</span>
+<span id="cb36-45"><a href="materialized-views-1.html#cb36-45" aria-hidden="true"></a>                )</span>
+<span id="cb36-46"><a href="materialized-views-1.html#cb36-46" aria-hidden="true"></a>              )</span>
+<span id="cb36-47"><a href="materialized-views-1.html#cb36-47" aria-hidden="true"></a>          ) ar1</span>
+<span id="cb36-48"><a href="materialized-views-1.html#cb36-48" aria-hidden="true"></a>          <span class="kw">JOIN</span> (</span>
+<span id="cb36-49"><a href="materialized-views-1.html#cb36-49" aria-hidden="true"></a>            <span class="kw">SELECT</span></span>
+<span id="cb36-50"><a href="materialized-views-1.html#cb36-50" aria-hidden="true"></a>              ar.data_source_id,</span>
+<span id="cb36-51"><a href="materialized-views-1.html#cb36-51" aria-hidden="true"></a>              ar.analysis_id,</span>
+<span id="cb36-52"><a href="materialized-views-1.html#cb36-52" aria-hidden="true"></a>              ar.stratum_1 <span class="kw">AS</span> concept_id,</span>
+<span id="cb36-53"><a href="materialized-views-1.html#cb36-53" aria-hidden="true"></a>              ar.count_value <span class="kw">AS</span> drc</span>
+<span id="cb36-54"><a href="materialized-views-1.html#cb36-54" aria-hidden="true"></a>            <span class="kw">FROM</span></span>
+<span id="cb36-55"><a href="materialized-views-1.html#cb36-55" aria-hidden="true"></a>              achilles_results ar</span>
+<span id="cb36-56"><a href="materialized-views-1.html#cb36-56" aria-hidden="true"></a>            <span class="kw">WHERE</span></span>
+<span id="cb36-57"><a href="materialized-views-1.html#cb36-57" aria-hidden="true"></a>              (</span>
+<span id="cb36-58"><a href="materialized-views-1.html#cb36-58" aria-hidden="true"></a>                ar.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb36-59"><a href="materialized-views-1.html#cb36-59" aria-hidden="true"></a>                  <span class="dt">ARRAY</span>[(<span class="dv">430</span>):: bigint,</span>
+<span id="cb36-60"><a href="materialized-views-1.html#cb36-60" aria-hidden="true"></a>                  (<span class="dv">630</span>):: bigint,</span>
+<span id="cb36-61"><a href="materialized-views-1.html#cb36-61" aria-hidden="true"></a>                  (<span class="dv">730</span>):: bigint,</span>
+<span id="cb36-62"><a href="materialized-views-1.html#cb36-62" aria-hidden="true"></a>                  (<span class="dv">830</span>):: bigint,</span>
+<span id="cb36-63"><a href="materialized-views-1.html#cb36-63" aria-hidden="true"></a>                  (<span class="dv">1830</span>):: bigint,</span>
+<span id="cb36-64"><a href="materialized-views-1.html#cb36-64" aria-hidden="true"></a>                  (<span class="dv">2130</span>):: bigint]</span>
+<span id="cb36-65"><a href="materialized-views-1.html#cb36-65" aria-hidden="true"></a>                )</span>
+<span id="cb36-66"><a href="materialized-views-1.html#cb36-66" aria-hidden="true"></a>              )</span>
+<span id="cb36-67"><a href="materialized-views-1.html#cb36-67" aria-hidden="true"></a>          ) ar2 <span class="kw">ON</span> (</span>
+<span id="cb36-68"><a href="materialized-views-1.html#cb36-68" aria-hidden="true"></a>            (</span>
+<span id="cb36-69"><a href="materialized-views-1.html#cb36-69" aria-hidden="true"></a>              (ar1.concept_id <span class="op">=</span> ar2.concept_id)</span>
+<span id="cb36-70"><a href="materialized-views-1.html#cb36-70" aria-hidden="true"></a>              <span class="kw">AND</span> (</span>
+<span id="cb36-71"><a href="materialized-views-1.html#cb36-71" aria-hidden="true"></a>                ar1.data_source_id <span class="op">=</span> ar2.data_source_id</span>
+<span id="cb36-72"><a href="materialized-views-1.html#cb36-72" aria-hidden="true"></a>              )</span>
+<span id="cb36-73"><a href="materialized-views-1.html#cb36-73" aria-hidden="true"></a>            )</span>
+<span id="cb36-74"><a href="materialized-views-1.html#cb36-74" aria-hidden="true"></a>          )</span>
+<span id="cb36-75"><a href="materialized-views-1.html#cb36-75" aria-hidden="true"></a>        )</span>
+<span id="cb36-76"><a href="materialized-views-1.html#cb36-76" aria-hidden="true"></a>        <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> (</span>
+<span id="cb36-77"><a href="materialized-views-1.html#cb36-77" aria-hidden="true"></a>          (ar1.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)</span>
+<span id="cb36-78"><a href="materialized-views-1.html#cb36-78" aria-hidden="true"></a>        )</span>
+<span id="cb36-79"><a href="materialized-views-1.html#cb36-79" aria-hidden="true"></a>      )</span>
+<span id="cb36-80"><a href="materialized-views-1.html#cb36-80" aria-hidden="true"></a>      <span class="kw">JOIN</span> country <span class="kw">ON</span> (</span>
+<span id="cb36-81"><a href="materialized-views-1.html#cb36-81" aria-hidden="true"></a>        (country.<span class="kw">id</span> <span class="op">=</span> <span class="kw">source</span>.country_id)</span>
+<span id="cb36-82"><a href="materialized-views-1.html#cb36-82" aria-hidden="true"></a>      )</span>
+<span id="cb36-83"><a href="materialized-views-1.html#cb36-83" aria-hidden="true"></a>    )</span>
+<span id="cb36-84"><a href="materialized-views-1.html#cb36-84" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept concept <span class="kw">ON</span> (</span>
+<span id="cb36-85"><a href="materialized-views-1.html#cb36-85" aria-hidden="true"></a>      (</span>
+<span id="cb36-86"><a href="materialized-views-1.html#cb36-86" aria-hidden="true"></a>        ar1.concept_id <span class="op">=</span> (concept.concept_id):: text</span>
+<span id="cb36-87"><a href="materialized-views-1.html#cb36-87" aria-hidden="true"></a>      )</span>
+<span id="cb36-88"><a href="materialized-views-1.html#cb36-88" aria-hidden="true"></a>    )</span>
+<span id="cb36-89"><a href="materialized-views-1.html#cb36-89" aria-hidden="true"></a>  )</span>
+<span id="cb36-90"><a href="materialized-views-1.html#cb36-90" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span></span>
+<span id="cb36-91"><a href="materialized-views-1.html#cb36-91" aria-hidden="true"></a>  <span class="kw">source</span>.name,</span>
+<span id="cb36-92"><a href="materialized-views-1.html#cb36-92" aria-hidden="true"></a>  <span class="kw">source</span>.database_type,</span>
+<span id="cb36-93"><a href="materialized-views-1.html#cb36-93" aria-hidden="true"></a>  country.country,</span>
+<span id="cb36-94"><a href="materialized-views-1.html#cb36-94" aria-hidden="true"></a>  concept.domain_id,</span>
+<span id="cb36-95"><a href="materialized-views-1.html#cb36-95" aria-hidden="true"></a>  concept.concept_id,</span>
+<span id="cb36-96"><a href="materialized-views-1.html#cb36-96" aria-hidden="true"></a>  concept.concept_name;</span></code></pre></div>
 </div>
 <div id="data_density" class="section level3 unnumbered" number="">
 <h3>data_density</h3>
+<div class="sourceCode" id="cb37"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb37-1"><a href="materialized-views-1.html#cb37-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.acronym,</span>
+<span id="cb37-2"><a href="materialized-views-1.html#cb37-2" aria-hidden="true"></a>   t1.table_name <span class="kw">AS</span> series_name,</span>
+<span id="cb37-3"><a href="materialized-views-1.html#cb37-3" aria-hidden="true"></a>   <span class="fu">to_date</span>(t1.stratum_1, <span class="st">&#39;YYYYMM&#39;</span>:<span class="ch">:text</span>) <span class="kw">AS</span> x_calendar_month,</span>
+<span id="cb37-4"><a href="materialized-views-1.html#cb37-4" aria-hidden="true"></a>   t1.count_value <span class="kw">AS</span> y_record_count</span>
+<span id="cb37-5"><a href="materialized-views-1.html#cb37-5" aria-hidden="true"></a>  <span class="kw">FROM</span> (( <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-6"><a href="materialized-views-1.html#cb37-6" aria-hidden="true"></a>           <span class="st">&#39;Visit occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-7"><a href="materialized-views-1.html#cb37-7" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-8"><a href="materialized-views-1.html#cb37-8" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-9"><a href="materialized-views-1.html#cb37-9" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-10"><a href="materialized-views-1.html#cb37-10" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">220</span>)</span>
+<span id="cb37-11"><a href="materialized-views-1.html#cb37-11" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb37-12"><a href="materialized-views-1.html#cb37-12" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-13"><a href="materialized-views-1.html#cb37-13" aria-hidden="true"></a>           <span class="st">&#39;Condition occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-14"><a href="materialized-views-1.html#cb37-14" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-15"><a href="materialized-views-1.html#cb37-15" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-16"><a href="materialized-views-1.html#cb37-16" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-17"><a href="materialized-views-1.html#cb37-17" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">420</span>)</span>
+<span id="cb37-18"><a href="materialized-views-1.html#cb37-18" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb37-19"><a href="materialized-views-1.html#cb37-19" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-20"><a href="materialized-views-1.html#cb37-20" aria-hidden="true"></a>           <span class="st">&#39;Death&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-21"><a href="materialized-views-1.html#cb37-21" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-22"><a href="materialized-views-1.html#cb37-22" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-23"><a href="materialized-views-1.html#cb37-23" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-24"><a href="materialized-views-1.html#cb37-24" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">502</span>)</span>
+<span id="cb37-25"><a href="materialized-views-1.html#cb37-25" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb37-26"><a href="materialized-views-1.html#cb37-26" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-27"><a href="materialized-views-1.html#cb37-27" aria-hidden="true"></a>           <span class="st">&#39;Procedure occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-28"><a href="materialized-views-1.html#cb37-28" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-29"><a href="materialized-views-1.html#cb37-29" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-30"><a href="materialized-views-1.html#cb37-30" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-31"><a href="materialized-views-1.html#cb37-31" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">620</span>)</span>
+<span id="cb37-32"><a href="materialized-views-1.html#cb37-32" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb37-33"><a href="materialized-views-1.html#cb37-33" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-34"><a href="materialized-views-1.html#cb37-34" aria-hidden="true"></a>           <span class="st">&#39;Drug exposure&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-35"><a href="materialized-views-1.html#cb37-35" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-36"><a href="materialized-views-1.html#cb37-36" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-37"><a href="materialized-views-1.html#cb37-37" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-38"><a href="materialized-views-1.html#cb37-38" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">720</span>)</span>
+<span id="cb37-39"><a href="materialized-views-1.html#cb37-39" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb37-40"><a href="materialized-views-1.html#cb37-40" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-41"><a href="materialized-views-1.html#cb37-41" aria-hidden="true"></a>           <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-42"><a href="materialized-views-1.html#cb37-42" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-43"><a href="materialized-views-1.html#cb37-43" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-44"><a href="materialized-views-1.html#cb37-44" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-45"><a href="materialized-views-1.html#cb37-45" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">820</span>)</span>
+<span id="cb37-46"><a href="materialized-views-1.html#cb37-46" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb37-47"><a href="materialized-views-1.html#cb37-47" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-48"><a href="materialized-views-1.html#cb37-48" aria-hidden="true"></a>           <span class="st">&#39;Drug era&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-49"><a href="materialized-views-1.html#cb37-49" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-50"><a href="materialized-views-1.html#cb37-50" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-51"><a href="materialized-views-1.html#cb37-51" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-52"><a href="materialized-views-1.html#cb37-52" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">920</span>)</span>
+<span id="cb37-53"><a href="materialized-views-1.html#cb37-53" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb37-54"><a href="materialized-views-1.html#cb37-54" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-55"><a href="materialized-views-1.html#cb37-55" aria-hidden="true"></a>           <span class="st">&#39;Device Exposure&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-56"><a href="materialized-views-1.html#cb37-56" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-57"><a href="materialized-views-1.html#cb37-57" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-58"><a href="materialized-views-1.html#cb37-58" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-59"><a href="materialized-views-1.html#cb37-59" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">2120</span>)</span>
+<span id="cb37-60"><a href="materialized-views-1.html#cb37-60" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb37-61"><a href="materialized-views-1.html#cb37-61" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-62"><a href="materialized-views-1.html#cb37-62" aria-hidden="true"></a>           <span class="st">&#39;Condition era&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-63"><a href="materialized-views-1.html#cb37-63" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-64"><a href="materialized-views-1.html#cb37-64" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-65"><a href="materialized-views-1.html#cb37-65" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-66"><a href="materialized-views-1.html#cb37-66" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1020</span>)</span>
+<span id="cb37-67"><a href="materialized-views-1.html#cb37-67" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb37-68"><a href="materialized-views-1.html#cb37-68" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-69"><a href="materialized-views-1.html#cb37-69" aria-hidden="true"></a>           <span class="st">&#39;Observation period&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-70"><a href="materialized-views-1.html#cb37-70" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-71"><a href="materialized-views-1.html#cb37-71" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-72"><a href="materialized-views-1.html#cb37-72" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-73"><a href="materialized-views-1.html#cb37-73" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">111</span>)</span>
+<span id="cb37-74"><a href="materialized-views-1.html#cb37-74" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb37-75"><a href="materialized-views-1.html#cb37-75" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb37-76"><a href="materialized-views-1.html#cb37-76" aria-hidden="true"></a>           <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb37-77"><a href="materialized-views-1.html#cb37-77" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb37-78"><a href="materialized-views-1.html#cb37-78" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb37-79"><a href="materialized-views-1.html#cb37-79" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb37-80"><a href="materialized-views-1.html#cb37-80" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1820</span>)) t1</span>
+<span id="cb37-81"><a href="materialized-views-1.html#cb37-81" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((<span class="kw">source</span>.<span class="kw">id</span> <span class="op">=</span> t1.<span class="kw">id</span>)))</span>
+<span id="cb37-82"><a href="materialized-views-1.html#cb37-82" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> t1.table_name, (</span>
+<span id="cb37-83"><a href="materialized-views-1.html#cb37-83" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
+<span id="cb37-84"><a href="materialized-views-1.html#cb37-84" aria-hidden="true"></a>           <span class="cf">WHEN</span> (t1.stratum_1 ~ <span class="st">&#39;^\d+\.?\d+$&#39;</span>:<span class="ch">:text</span>)</span>
+<span id="cb37-85"><a href="materialized-views-1.html#cb37-85" aria-hidden="true"></a>             <span class="cf">THEN</span> t1.stratum_1</span>
+<span id="cb37-86"><a href="materialized-views-1.html#cb37-86" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:text</span></span>
+<span id="cb37-87"><a href="materialized-views-1.html#cb37-87" aria-hidden="true"></a>       <span class="cf">END</span>):<span class="ch">:integer</span>;</span></code></pre></div>
+</div>
+<div id="records_per_person" class="section level3 unnumbered" number="">
+<h3>records_per_person</h3>
 <div class="sourceCode" id="cb38"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb38-1"><a href="materialized-views-1.html#cb38-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.acronym,</span>
 <span id="cb38-2"><a href="materialized-views-1.html#cb38-2" aria-hidden="true"></a>   t1.table_name <span class="kw">AS</span> series_name,</span>
 <span id="cb38-3"><a href="materialized-views-1.html#cb38-3" aria-hidden="true"></a>   <span class="fu">to_date</span>(t1.stratum_1, <span class="st">&#39;YYYYMM&#39;</span>:<span class="ch">:text</span>) <span class="kw">AS</span> x_calendar_month,</span>
-<span id="cb38-4"><a href="materialized-views-1.html#cb38-4" aria-hidden="true"></a>   t1.count_value <span class="kw">AS</span> y_record_count</span>
-<span id="cb38-5"><a href="materialized-views-1.html#cb38-5" aria-hidden="true"></a>  <span class="kw">FROM</span> (( <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-6"><a href="materialized-views-1.html#cb38-6" aria-hidden="true"></a>           <span class="st">&#39;Visit occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb38-7"><a href="materialized-views-1.html#cb38-7" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb38-8"><a href="materialized-views-1.html#cb38-8" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb38-9"><a href="materialized-views-1.html#cb38-9" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb38-10"><a href="materialized-views-1.html#cb38-10" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">220</span>)</span>
-<span id="cb38-11"><a href="materialized-views-1.html#cb38-11" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb38-12"><a href="materialized-views-1.html#cb38-12" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-13"><a href="materialized-views-1.html#cb38-13" aria-hidden="true"></a>           <span class="st">&#39;Condition occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-4"><a href="materialized-views-1.html#cb38-4" aria-hidden="true"></a>   <span class="fu">round</span>(</span>
+<span id="cb38-5"><a href="materialized-views-1.html#cb38-5" aria-hidden="true"></a>     (</span>
+<span id="cb38-6"><a href="materialized-views-1.html#cb38-6" aria-hidden="true"></a>       (<span class="fl">1.0</span> <span class="op">*</span> (t1.count_value):<span class="ch">:numeric</span>)</span>
+<span id="cb38-7"><a href="materialized-views-1.html#cb38-7" aria-hidden="true"></a>       <span class="op">/</span></span>
+<span id="cb38-8"><a href="materialized-views-1.html#cb38-8" aria-hidden="true"></a>       (denom.count_value):<span class="ch">:numeric</span></span>
+<span id="cb38-9"><a href="materialized-views-1.html#cb38-9" aria-hidden="true"></a>     ),</span>
+<span id="cb38-10"><a href="materialized-views-1.html#cb38-10" aria-hidden="true"></a>     <span class="dv">5</span></span>
+<span id="cb38-11"><a href="materialized-views-1.html#cb38-11" aria-hidden="true"></a>   ) <span class="kw">AS</span> y_record_count</span>
+<span id="cb38-12"><a href="materialized-views-1.html#cb38-12" aria-hidden="true"></a>  <span class="kw">FROM</span> ((( <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb38-13"><a href="materialized-views-1.html#cb38-13" aria-hidden="true"></a>           <span class="st">&#39;Visit occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
 <span id="cb38-14"><a href="materialized-views-1.html#cb38-14" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
 <span id="cb38-15"><a href="materialized-views-1.html#cb38-15" aria-hidden="true"></a>           achilles_results.count_value</span>
 <span id="cb38-16"><a href="materialized-views-1.html#cb38-16" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb38-17"><a href="materialized-views-1.html#cb38-17" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">420</span>)</span>
+<span id="cb38-17"><a href="materialized-views-1.html#cb38-17" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">220</span>)</span>
 <span id="cb38-18"><a href="materialized-views-1.html#cb38-18" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
 <span id="cb38-19"><a href="materialized-views-1.html#cb38-19" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-20"><a href="materialized-views-1.html#cb38-20" aria-hidden="true"></a>           <span class="st">&#39;Death&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-20"><a href="materialized-views-1.html#cb38-20" aria-hidden="true"></a>           <span class="st">&#39;Condition occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
 <span id="cb38-21"><a href="materialized-views-1.html#cb38-21" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
 <span id="cb38-22"><a href="materialized-views-1.html#cb38-22" aria-hidden="true"></a>           achilles_results.count_value</span>
 <span id="cb38-23"><a href="materialized-views-1.html#cb38-23" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb38-24"><a href="materialized-views-1.html#cb38-24" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">502</span>)</span>
+<span id="cb38-24"><a href="materialized-views-1.html#cb38-24" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">420</span>)</span>
 <span id="cb38-25"><a href="materialized-views-1.html#cb38-25" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
 <span id="cb38-26"><a href="materialized-views-1.html#cb38-26" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-27"><a href="materialized-views-1.html#cb38-27" aria-hidden="true"></a>           <span class="st">&#39;Procedure occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-27"><a href="materialized-views-1.html#cb38-27" aria-hidden="true"></a>           <span class="st">&#39;Death&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
 <span id="cb38-28"><a href="materialized-views-1.html#cb38-28" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
 <span id="cb38-29"><a href="materialized-views-1.html#cb38-29" aria-hidden="true"></a>           achilles_results.count_value</span>
 <span id="cb38-30"><a href="materialized-views-1.html#cb38-30" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb38-31"><a href="materialized-views-1.html#cb38-31" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">620</span>)</span>
+<span id="cb38-31"><a href="materialized-views-1.html#cb38-31" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">502</span>)</span>
 <span id="cb38-32"><a href="materialized-views-1.html#cb38-32" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
 <span id="cb38-33"><a href="materialized-views-1.html#cb38-33" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-34"><a href="materialized-views-1.html#cb38-34" aria-hidden="true"></a>           <span class="st">&#39;Drug exposure&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-34"><a href="materialized-views-1.html#cb38-34" aria-hidden="true"></a>           <span class="st">&#39;Procedure occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
 <span id="cb38-35"><a href="materialized-views-1.html#cb38-35" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
 <span id="cb38-36"><a href="materialized-views-1.html#cb38-36" aria-hidden="true"></a>           achilles_results.count_value</span>
 <span id="cb38-37"><a href="materialized-views-1.html#cb38-37" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb38-38"><a href="materialized-views-1.html#cb38-38" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">720</span>)</span>
+<span id="cb38-38"><a href="materialized-views-1.html#cb38-38" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">620</span>)</span>
 <span id="cb38-39"><a href="materialized-views-1.html#cb38-39" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
 <span id="cb38-40"><a href="materialized-views-1.html#cb38-40" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-41"><a href="materialized-views-1.html#cb38-41" aria-hidden="true"></a>           <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-41"><a href="materialized-views-1.html#cb38-41" aria-hidden="true"></a>           <span class="st">&#39;Drug exposure&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
 <span id="cb38-42"><a href="materialized-views-1.html#cb38-42" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
 <span id="cb38-43"><a href="materialized-views-1.html#cb38-43" aria-hidden="true"></a>           achilles_results.count_value</span>
 <span id="cb38-44"><a href="materialized-views-1.html#cb38-44" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb38-45"><a href="materialized-views-1.html#cb38-45" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">820</span>)</span>
+<span id="cb38-45"><a href="materialized-views-1.html#cb38-45" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">720</span>)</span>
 <span id="cb38-46"><a href="materialized-views-1.html#cb38-46" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
 <span id="cb38-47"><a href="materialized-views-1.html#cb38-47" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-48"><a href="materialized-views-1.html#cb38-48" aria-hidden="true"></a>           <span class="st">&#39;Drug era&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-48"><a href="materialized-views-1.html#cb38-48" aria-hidden="true"></a>           <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
 <span id="cb38-49"><a href="materialized-views-1.html#cb38-49" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
 <span id="cb38-50"><a href="materialized-views-1.html#cb38-50" aria-hidden="true"></a>           achilles_results.count_value</span>
 <span id="cb38-51"><a href="materialized-views-1.html#cb38-51" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb38-52"><a href="materialized-views-1.html#cb38-52" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">920</span>)</span>
+<span id="cb38-52"><a href="materialized-views-1.html#cb38-52" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">820</span>)</span>
 <span id="cb38-53"><a href="materialized-views-1.html#cb38-53" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
 <span id="cb38-54"><a href="materialized-views-1.html#cb38-54" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-55"><a href="materialized-views-1.html#cb38-55" aria-hidden="true"></a>           <span class="st">&#39;Device Exposure&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-55"><a href="materialized-views-1.html#cb38-55" aria-hidden="true"></a>           <span class="st">&#39;Device exposure&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
 <span id="cb38-56"><a href="materialized-views-1.html#cb38-56" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
 <span id="cb38-57"><a href="materialized-views-1.html#cb38-57" aria-hidden="true"></a>           achilles_results.count_value</span>
 <span id="cb38-58"><a href="materialized-views-1.html#cb38-58" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
 <span id="cb38-59"><a href="materialized-views-1.html#cb38-59" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">2120</span>)</span>
 <span id="cb38-60"><a href="materialized-views-1.html#cb38-60" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
 <span id="cb38-61"><a href="materialized-views-1.html#cb38-61" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-62"><a href="materialized-views-1.html#cb38-62" aria-hidden="true"></a>           <span class="st">&#39;Condition era&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-62"><a href="materialized-views-1.html#cb38-62" aria-hidden="true"></a>           <span class="st">&#39;Drug era&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
 <span id="cb38-63"><a href="materialized-views-1.html#cb38-63" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
 <span id="cb38-64"><a href="materialized-views-1.html#cb38-64" aria-hidden="true"></a>           achilles_results.count_value</span>
 <span id="cb38-65"><a href="materialized-views-1.html#cb38-65" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb38-66"><a href="materialized-views-1.html#cb38-66" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1020</span>)</span>
+<span id="cb38-66"><a href="materialized-views-1.html#cb38-66" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">920</span>)</span>
 <span id="cb38-67"><a href="materialized-views-1.html#cb38-67" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
 <span id="cb38-68"><a href="materialized-views-1.html#cb38-68" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-69"><a href="materialized-views-1.html#cb38-69" aria-hidden="true"></a>           <span class="st">&#39;Observation period&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-69"><a href="materialized-views-1.html#cb38-69" aria-hidden="true"></a>           <span class="st">&#39;Condition era&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
 <span id="cb38-70"><a href="materialized-views-1.html#cb38-70" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
 <span id="cb38-71"><a href="materialized-views-1.html#cb38-71" aria-hidden="true"></a>           achilles_results.count_value</span>
 <span id="cb38-72"><a href="materialized-views-1.html#cb38-72" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb38-73"><a href="materialized-views-1.html#cb38-73" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">111</span>)</span>
+<span id="cb38-73"><a href="materialized-views-1.html#cb38-73" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1020</span>)</span>
 <span id="cb38-74"><a href="materialized-views-1.html#cb38-74" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
 <span id="cb38-75"><a href="materialized-views-1.html#cb38-75" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb38-76"><a href="materialized-views-1.html#cb38-76" aria-hidden="true"></a>           <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-76"><a href="materialized-views-1.html#cb38-76" aria-hidden="true"></a>           <span class="st">&#39;Observation period&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
 <span id="cb38-77"><a href="materialized-views-1.html#cb38-77" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
 <span id="cb38-78"><a href="materialized-views-1.html#cb38-78" aria-hidden="true"></a>           achilles_results.count_value</span>
 <span id="cb38-79"><a href="materialized-views-1.html#cb38-79" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb38-80"><a href="materialized-views-1.html#cb38-80" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1820</span>)) t1</span>
-<span id="cb38-81"><a href="materialized-views-1.html#cb38-81" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((<span class="kw">source</span>.<span class="kw">id</span> <span class="op">=</span> t1.<span class="kw">id</span>)))</span>
-<span id="cb38-82"><a href="materialized-views-1.html#cb38-82" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> t1.table_name, (</span>
-<span id="cb38-83"><a href="materialized-views-1.html#cb38-83" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb38-84"><a href="materialized-views-1.html#cb38-84" aria-hidden="true"></a>           <span class="cf">WHEN</span> (t1.stratum_1 ~ <span class="st">&#39;^\d+\.?\d+$&#39;</span>:<span class="ch">:text</span>) <span class="cf">THEN</span> t1.stratum_1</span>
-<span id="cb38-85"><a href="materialized-views-1.html#cb38-85" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:text</span></span>
-<span id="cb38-86"><a href="materialized-views-1.html#cb38-86" aria-hidden="true"></a>       <span class="cf">END</span>):<span class="ch">:integer</span>;</span></code></pre></div>
-</div>
-<div id="records_per_person" class="section level3 unnumbered" number="">
-<h3>records_per_person</h3>
-<div class="sourceCode" id="cb39"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb39-1"><a href="materialized-views-1.html#cb39-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.acronym,</span>
-<span id="cb39-2"><a href="materialized-views-1.html#cb39-2" aria-hidden="true"></a>   t1.table_name <span class="kw">AS</span> series_name,</span>
-<span id="cb39-3"><a href="materialized-views-1.html#cb39-3" aria-hidden="true"></a>   <span class="fu">to_date</span>(t1.stratum_1, <span class="st">&#39;YYYYMM&#39;</span>:<span class="ch">:text</span>) <span class="kw">AS</span> x_calendar_month,</span>
-<span id="cb39-4"><a href="materialized-views-1.html#cb39-4" aria-hidden="true"></a>   <span class="fu">round</span>(((<span class="fl">1.0</span> <span class="op">*</span> (t1.count_value):<span class="ch">:numeric</span>) <span class="op">/</span> (denom.count_value):<span class="ch">:numeric</span>), <span class="dv">5</span>) <span class="kw">AS</span> y_record_count</span>
-<span id="cb39-5"><a href="materialized-views-1.html#cb39-5" aria-hidden="true"></a>  <span class="kw">FROM</span> ((( <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-6"><a href="materialized-views-1.html#cb39-6" aria-hidden="true"></a>           <span class="st">&#39;Visit occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-7"><a href="materialized-views-1.html#cb39-7" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-8"><a href="materialized-views-1.html#cb39-8" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-9"><a href="materialized-views-1.html#cb39-9" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-10"><a href="materialized-views-1.html#cb39-10" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">220</span>)</span>
-<span id="cb39-11"><a href="materialized-views-1.html#cb39-11" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb39-12"><a href="materialized-views-1.html#cb39-12" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-13"><a href="materialized-views-1.html#cb39-13" aria-hidden="true"></a>           <span class="st">&#39;Condition occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-14"><a href="materialized-views-1.html#cb39-14" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-15"><a href="materialized-views-1.html#cb39-15" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-16"><a href="materialized-views-1.html#cb39-16" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-17"><a href="materialized-views-1.html#cb39-17" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">420</span>)</span>
-<span id="cb39-18"><a href="materialized-views-1.html#cb39-18" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb39-19"><a href="materialized-views-1.html#cb39-19" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-20"><a href="materialized-views-1.html#cb39-20" aria-hidden="true"></a>           <span class="st">&#39;Death&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-21"><a href="materialized-views-1.html#cb39-21" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-22"><a href="materialized-views-1.html#cb39-22" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-23"><a href="materialized-views-1.html#cb39-23" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-24"><a href="materialized-views-1.html#cb39-24" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">502</span>)</span>
-<span id="cb39-25"><a href="materialized-views-1.html#cb39-25" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb39-26"><a href="materialized-views-1.html#cb39-26" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-27"><a href="materialized-views-1.html#cb39-27" aria-hidden="true"></a>           <span class="st">&#39;Procedure occurrence&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-28"><a href="materialized-views-1.html#cb39-28" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-29"><a href="materialized-views-1.html#cb39-29" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-30"><a href="materialized-views-1.html#cb39-30" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-31"><a href="materialized-views-1.html#cb39-31" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">620</span>)</span>
-<span id="cb39-32"><a href="materialized-views-1.html#cb39-32" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb39-33"><a href="materialized-views-1.html#cb39-33" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-34"><a href="materialized-views-1.html#cb39-34" aria-hidden="true"></a>           <span class="st">&#39;Drug exposure&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-35"><a href="materialized-views-1.html#cb39-35" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-36"><a href="materialized-views-1.html#cb39-36" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-37"><a href="materialized-views-1.html#cb39-37" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-38"><a href="materialized-views-1.html#cb39-38" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">720</span>)</span>
-<span id="cb39-39"><a href="materialized-views-1.html#cb39-39" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb39-40"><a href="materialized-views-1.html#cb39-40" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-41"><a href="materialized-views-1.html#cb39-41" aria-hidden="true"></a>           <span class="st">&#39;Observation&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-42"><a href="materialized-views-1.html#cb39-42" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-43"><a href="materialized-views-1.html#cb39-43" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-44"><a href="materialized-views-1.html#cb39-44" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-45"><a href="materialized-views-1.html#cb39-45" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">820</span>)</span>
-<span id="cb39-46"><a href="materialized-views-1.html#cb39-46" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb39-47"><a href="materialized-views-1.html#cb39-47" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-48"><a href="materialized-views-1.html#cb39-48" aria-hidden="true"></a>           <span class="st">&#39;Device exposure&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-49"><a href="materialized-views-1.html#cb39-49" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-50"><a href="materialized-views-1.html#cb39-50" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-51"><a href="materialized-views-1.html#cb39-51" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-52"><a href="materialized-views-1.html#cb39-52" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">2120</span>)</span>
-<span id="cb39-53"><a href="materialized-views-1.html#cb39-53" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb39-54"><a href="materialized-views-1.html#cb39-54" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-55"><a href="materialized-views-1.html#cb39-55" aria-hidden="true"></a>           <span class="st">&#39;Drug era&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-56"><a href="materialized-views-1.html#cb39-56" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-57"><a href="materialized-views-1.html#cb39-57" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-58"><a href="materialized-views-1.html#cb39-58" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-59"><a href="materialized-views-1.html#cb39-59" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">920</span>)</span>
-<span id="cb39-60"><a href="materialized-views-1.html#cb39-60" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb39-61"><a href="materialized-views-1.html#cb39-61" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-62"><a href="materialized-views-1.html#cb39-62" aria-hidden="true"></a>           <span class="st">&#39;Condition era&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-63"><a href="materialized-views-1.html#cb39-63" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-64"><a href="materialized-views-1.html#cb39-64" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-65"><a href="materialized-views-1.html#cb39-65" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-66"><a href="materialized-views-1.html#cb39-66" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1020</span>)</span>
-<span id="cb39-67"><a href="materialized-views-1.html#cb39-67" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb39-68"><a href="materialized-views-1.html#cb39-68" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-69"><a href="materialized-views-1.html#cb39-69" aria-hidden="true"></a>           <span class="st">&#39;Observation period&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-70"><a href="materialized-views-1.html#cb39-70" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-71"><a href="materialized-views-1.html#cb39-71" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-72"><a href="materialized-views-1.html#cb39-72" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-73"><a href="materialized-views-1.html#cb39-73" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">111</span>)</span>
-<span id="cb39-74"><a href="materialized-views-1.html#cb39-74" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
-<span id="cb39-75"><a href="materialized-views-1.html#cb39-75" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
-<span id="cb39-76"><a href="materialized-views-1.html#cb39-76" aria-hidden="true"></a>           <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
-<span id="cb39-77"><a href="materialized-views-1.html#cb39-77" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-78"><a href="materialized-views-1.html#cb39-78" aria-hidden="true"></a>           achilles_results.count_value</span>
-<span id="cb39-79"><a href="materialized-views-1.html#cb39-79" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-80"><a href="materialized-views-1.html#cb39-80" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1820</span>)) t1</span>
-<span id="cb39-81"><a href="materialized-views-1.html#cb39-81" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.<span class="kw">id</span>,</span>
-<span id="cb39-82"><a href="materialized-views-1.html#cb39-82" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
-<span id="cb39-83"><a href="materialized-views-1.html#cb39-83" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
-<span id="cb39-84"><a href="materialized-views-1.html#cb39-84" aria-hidden="true"></a>           achilles_results.stratum_2,</span>
-<span id="cb39-85"><a href="materialized-views-1.html#cb39-85" aria-hidden="true"></a>           achilles_results.stratum_3,</span>
-<span id="cb39-86"><a href="materialized-views-1.html#cb39-86" aria-hidden="true"></a>           achilles_results.stratum_4,</span>
-<span id="cb39-87"><a href="materialized-views-1.html#cb39-87" aria-hidden="true"></a>           achilles_results.stratum_5,</span>
-<span id="cb39-88"><a href="materialized-views-1.html#cb39-88" aria-hidden="true"></a>           achilles_results.count_value,</span>
-<span id="cb39-89"><a href="materialized-views-1.html#cb39-89" aria-hidden="true"></a>           achilles_results.data_source_id,</span>
-<span id="cb39-90"><a href="materialized-views-1.html#cb39-90" aria-hidden="true"></a>           achilles_results.avg_value,</span>
-<span id="cb39-91"><a href="materialized-views-1.html#cb39-91" aria-hidden="true"></a>           achilles_results.max_value,</span>
-<span id="cb39-92"><a href="materialized-views-1.html#cb39-92" aria-hidden="true"></a>           achilles_results.median_value,</span>
-<span id="cb39-93"><a href="materialized-views-1.html#cb39-93" aria-hidden="true"></a>           achilles_results.min_value,</span>
-<span id="cb39-94"><a href="materialized-views-1.html#cb39-94" aria-hidden="true"></a>           achilles_results.p10_value,</span>
-<span id="cb39-95"><a href="materialized-views-1.html#cb39-95" aria-hidden="true"></a>           achilles_results.p25_value,</span>
-<span id="cb39-96"><a href="materialized-views-1.html#cb39-96" aria-hidden="true"></a>           achilles_results.p75_value,</span>
-<span id="cb39-97"><a href="materialized-views-1.html#cb39-97" aria-hidden="true"></a>           achilles_results.p90_value,</span>
-<span id="cb39-98"><a href="materialized-views-1.html#cb39-98" aria-hidden="true"></a>           achilles_results.stdev_value</span>
-<span id="cb39-99"><a href="materialized-views-1.html#cb39-99" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb39-100"><a href="materialized-views-1.html#cb39-100" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">117</span>)) denom <span class="kw">ON</span> (((t1.stratum_1 <span class="op">=</span> denom.stratum_1) <span class="kw">AND</span> (t1.<span class="kw">id</span> <span class="op">=</span> denom.data_source_id))))</span>
-<span id="cb39-101"><a href="materialized-views-1.html#cb39-101" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((<span class="kw">source</span>.<span class="kw">id</span> <span class="op">=</span> t1.<span class="kw">id</span>)))</span>
-<span id="cb39-102"><a href="materialized-views-1.html#cb39-102" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> t1.table_name, (</span>
-<span id="cb39-103"><a href="materialized-views-1.html#cb39-103" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
-<span id="cb39-104"><a href="materialized-views-1.html#cb39-104" aria-hidden="true"></a>           <span class="cf">WHEN</span> (t1.stratum_1 ~ <span class="st">&#39;^\d+\.?\d+$&#39;</span>:<span class="ch">:text</span>) <span class="cf">THEN</span> t1.stratum_1</span>
-<span id="cb39-105"><a href="materialized-views-1.html#cb39-105" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:text</span></span>
-<span id="cb39-106"><a href="materialized-views-1.html#cb39-106" aria-hidden="true"></a>       <span class="cf">END</span>):<span class="ch">:integer</span>;</span></code></pre></div>
+<span id="cb38-80"><a href="materialized-views-1.html#cb38-80" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">111</span>)</span>
+<span id="cb38-81"><a href="materialized-views-1.html#cb38-81" aria-hidden="true"></a>       <span class="kw">UNION</span> <span class="kw">ALL</span></span>
+<span id="cb38-82"><a href="materialized-views-1.html#cb38-82" aria-hidden="true"></a>        <span class="kw">SELECT</span> achilles_results.data_source_id <span class="kw">AS</span> <span class="kw">id</span>,</span>
+<span id="cb38-83"><a href="materialized-views-1.html#cb38-83" aria-hidden="true"></a>           <span class="st">&#39;Measurement&#39;</span>:<span class="ch">:text</span> <span class="kw">AS</span> table_name,</span>
+<span id="cb38-84"><a href="materialized-views-1.html#cb38-84" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb38-85"><a href="materialized-views-1.html#cb38-85" aria-hidden="true"></a>           achilles_results.count_value</span>
+<span id="cb38-86"><a href="materialized-views-1.html#cb38-86" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb38-87"><a href="materialized-views-1.html#cb38-87" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">1820</span>)) t1</span>
+<span id="cb38-88"><a href="materialized-views-1.html#cb38-88" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> achilles_results.<span class="kw">id</span>,</span>
+<span id="cb38-89"><a href="materialized-views-1.html#cb38-89" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
+<span id="cb38-90"><a href="materialized-views-1.html#cb38-90" aria-hidden="true"></a>           achilles_results.stratum_1,</span>
+<span id="cb38-91"><a href="materialized-views-1.html#cb38-91" aria-hidden="true"></a>           achilles_results.stratum_2,</span>
+<span id="cb38-92"><a href="materialized-views-1.html#cb38-92" aria-hidden="true"></a>           achilles_results.stratum_3,</span>
+<span id="cb38-93"><a href="materialized-views-1.html#cb38-93" aria-hidden="true"></a>           achilles_results.stratum_4,</span>
+<span id="cb38-94"><a href="materialized-views-1.html#cb38-94" aria-hidden="true"></a>           achilles_results.stratum_5,</span>
+<span id="cb38-95"><a href="materialized-views-1.html#cb38-95" aria-hidden="true"></a>           achilles_results.count_value,</span>
+<span id="cb38-96"><a href="materialized-views-1.html#cb38-96" aria-hidden="true"></a>           achilles_results.data_source_id,</span>
+<span id="cb38-97"><a href="materialized-views-1.html#cb38-97" aria-hidden="true"></a>           achilles_results.avg_value,</span>
+<span id="cb38-98"><a href="materialized-views-1.html#cb38-98" aria-hidden="true"></a>           achilles_results.max_value,</span>
+<span id="cb38-99"><a href="materialized-views-1.html#cb38-99" aria-hidden="true"></a>           achilles_results.median_value,</span>
+<span id="cb38-100"><a href="materialized-views-1.html#cb38-100" aria-hidden="true"></a>           achilles_results.min_value,</span>
+<span id="cb38-101"><a href="materialized-views-1.html#cb38-101" aria-hidden="true"></a>           achilles_results.p10_value,</span>
+<span id="cb38-102"><a href="materialized-views-1.html#cb38-102" aria-hidden="true"></a>           achilles_results.p25_value,</span>
+<span id="cb38-103"><a href="materialized-views-1.html#cb38-103" aria-hidden="true"></a>           achilles_results.p75_value,</span>
+<span id="cb38-104"><a href="materialized-views-1.html#cb38-104" aria-hidden="true"></a>           achilles_results.p90_value,</span>
+<span id="cb38-105"><a href="materialized-views-1.html#cb38-105" aria-hidden="true"></a>           achilles_results.stdev_value</span>
+<span id="cb38-106"><a href="materialized-views-1.html#cb38-106" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
+<span id="cb38-107"><a href="materialized-views-1.html#cb38-107" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="dv">117</span>)) denom</span>
+<span id="cb38-108"><a href="materialized-views-1.html#cb38-108" aria-hidden="true"></a>           <span class="kw">ON</span> (((t1.stratum_1 <span class="op">=</span> denom.stratum_1)</span>
+<span id="cb38-109"><a href="materialized-views-1.html#cb38-109" aria-hidden="true"></a>             <span class="kw">AND</span> (t1.<span class="kw">id</span> <span class="op">=</span> denom.data_source_id))))</span>
+<span id="cb38-110"><a href="materialized-views-1.html#cb38-110" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((<span class="kw">source</span>.<span class="kw">id</span> <span class="op">=</span> t1.<span class="kw">id</span>)))</span>
+<span id="cb38-111"><a href="materialized-views-1.html#cb38-111" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> t1.table_name, (</span>
+<span id="cb38-112"><a href="materialized-views-1.html#cb38-112" aria-hidden="true"></a>       <span class="cf">CASE</span></span>
+<span id="cb38-113"><a href="materialized-views-1.html#cb38-113" aria-hidden="true"></a>           <span class="cf">WHEN</span> (t1.stratum_1 ~ <span class="st">&#39;^\d+\.?\d+$&#39;</span>:<span class="ch">:text</span>)</span>
+<span id="cb38-114"><a href="materialized-views-1.html#cb38-114" aria-hidden="true"></a>             <span class="cf">THEN</span> t1.stratum_1</span>
+<span id="cb38-115"><a href="materialized-views-1.html#cb38-115" aria-hidden="true"></a>           <span class="cf">ELSE</span> <span class="kw">NULL</span>:<span class="ch">:text</span></span>
+<span id="cb38-116"><a href="materialized-views-1.html#cb38-116" aria-hidden="true"></a>       <span class="cf">END</span>):<span class="ch">:integer</span>;</span></code></pre></div>
 </div>
 <div id="visit_age_distribution" class="section level3 unnumbered" number="">
 <h3>visit_age_distribution</h3>
-<div class="sourceCode" id="cb40"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb40-1"><a href="materialized-views-1.html#cb40-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb40-2"><a href="materialized-views-1.html#cb40-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb40-3"><a href="materialized-views-1.html#cb40-3" aria-hidden="true"></a>   c1.concept_name,</span>
-<span id="cb40-4"><a href="materialized-views-1.html#cb40-4" aria-hidden="true"></a>   c2.concept_name <span class="kw">AS</span> gender,</span>
-<span id="cb40-5"><a href="materialized-views-1.html#cb40-5" aria-hidden="true"></a>   achilles.count_value,</span>
-<span id="cb40-6"><a href="materialized-views-1.html#cb40-6" aria-hidden="true"></a>   achilles.p10_value <span class="kw">AS</span> p10,</span>
-<span id="cb40-7"><a href="materialized-views-1.html#cb40-7" aria-hidden="true"></a>   achilles.p25_value <span class="kw">AS</span> p25,</span>
-<span id="cb40-8"><a href="materialized-views-1.html#cb40-8" aria-hidden="true"></a>   achilles.median_value <span class="kw">AS</span> <span class="fu">median</span>,</span>
-<span id="cb40-9"><a href="materialized-views-1.html#cb40-9" aria-hidden="true"></a>   achilles.p75_value <span class="kw">AS</span> p75,</span>
-<span id="cb40-10"><a href="materialized-views-1.html#cb40-10" aria-hidden="true"></a>   achilles.p90_value <span class="kw">AS</span> p90</span>
-<span id="cb40-11"><a href="materialized-views-1.html#cb40-11" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results achilles</span>
-<span id="cb40-12"><a href="materialized-views-1.html#cb40-12" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb40-13"><a href="materialized-views-1.html#cb40-13" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept c1 <span class="kw">ON</span> ((achilles.stratum_1 <span class="op">=</span> (c1.concept_id):<span class="ch">:text</span>)))</span>
-<span id="cb40-14"><a href="materialized-views-1.html#cb40-14" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept c2 <span class="kw">ON</span> ((achilles.stratum_2 <span class="op">=</span> (c2.concept_id):<span class="ch">:text</span>)))</span>
-<span id="cb40-15"><a href="materialized-views-1.html#cb40-15" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">206</span>)</span>
-<span id="cb40-16"><a href="materialized-views-1.html#cb40-16" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> <span class="kw">source</span>.name, c1.concept_name, c2.concept_name;</span></code></pre></div>
+<div class="sourceCode" id="cb39"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb39-1"><a href="materialized-views-1.html#cb39-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb39-2"><a href="materialized-views-1.html#cb39-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
+<span id="cb39-3"><a href="materialized-views-1.html#cb39-3" aria-hidden="true"></a>   c1.concept_name,</span>
+<span id="cb39-4"><a href="materialized-views-1.html#cb39-4" aria-hidden="true"></a>   c2.concept_name <span class="kw">AS</span> gender,</span>
+<span id="cb39-5"><a href="materialized-views-1.html#cb39-5" aria-hidden="true"></a>   achilles.count_value,</span>
+<span id="cb39-6"><a href="materialized-views-1.html#cb39-6" aria-hidden="true"></a>   achilles.p10_value <span class="kw">AS</span> p10,</span>
+<span id="cb39-7"><a href="materialized-views-1.html#cb39-7" aria-hidden="true"></a>   achilles.p25_value <span class="kw">AS</span> p25,</span>
+<span id="cb39-8"><a href="materialized-views-1.html#cb39-8" aria-hidden="true"></a>   achilles.median_value <span class="kw">AS</span> <span class="fu">median</span>,</span>
+<span id="cb39-9"><a href="materialized-views-1.html#cb39-9" aria-hidden="true"></a>   achilles.p75_value <span class="kw">AS</span> p75,</span>
+<span id="cb39-10"><a href="materialized-views-1.html#cb39-10" aria-hidden="true"></a>   achilles.p90_value <span class="kw">AS</span> p90</span>
+<span id="cb39-11"><a href="materialized-views-1.html#cb39-11" aria-hidden="true"></a>  <span class="kw">FROM</span> (((achilles_results achilles</span>
+<span id="cb39-12"><a href="materialized-views-1.html#cb39-12" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span></span>
+<span id="cb39-13"><a href="materialized-views-1.html#cb39-13" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
+<span id="cb39-14"><a href="materialized-views-1.html#cb39-14" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept c1</span>
+<span id="cb39-15"><a href="materialized-views-1.html#cb39-15" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.stratum_1 <span class="op">=</span> (c1.concept_id):<span class="ch">:text</span>)))</span>
+<span id="cb39-16"><a href="materialized-views-1.html#cb39-16" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept c2</span>
+<span id="cb39-17"><a href="materialized-views-1.html#cb39-17" aria-hidden="true"></a>      <span class="kw">ON</span> ((achilles.stratum_2 <span class="op">=</span> (c2.concept_id):<span class="ch">:text</span>)))</span>
+<span id="cb39-18"><a href="materialized-views-1.html#cb39-18" aria-hidden="true"></a> <span class="kw">WHERE</span> (achilles.analysis_id <span class="op">=</span> <span class="dv">206</span>)</span>
+<span id="cb39-19"><a href="materialized-views-1.html#cb39-19" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> <span class="kw">source</span>.name, c1.concept_name, c2.concept_name;</span></code></pre></div>
 </div>
 <div id="concept_browser_table2" class="section level3 unnumbered" number="">
 <h3>concept_browser_table2</h3>
-<div class="sourceCode" id="cb41"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb41-1"><a href="materialized-views-1.html#cb41-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
-<span id="cb41-2"><a href="materialized-views-1.html#cb41-2" aria-hidden="true"></a>   <span class="kw">source</span>.acronym,</span>
-<span id="cb41-3"><a href="materialized-views-1.html#cb41-3" aria-hidden="true"></a>   ((((<span class="st">&#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39;</span>:<span class="ch">:text</span> <span class="op">||</span> ar1.concept_id) <span class="op">||</span> <span class="st">&#39;&quot;target=&quot;_blank&quot;&gt;&#39;</span>:<span class="ch">:text</span>) <span class="op">||</span> ar1.concept_id) <span class="op">||</span> <span class="st">&#39;&lt;/a&gt;&#39;</span>:<span class="ch">:text</span>) <span class="kw">AS</span> concept_id,</span>
-<span id="cb41-4"><a href="materialized-views-1.html#cb41-4" aria-hidden="true"></a>   concept.concept_name,</span>
-<span id="cb41-5"><a href="materialized-views-1.html#cb41-5" aria-hidden="true"></a>   concept.domain_id,</span>
-<span id="cb41-6"><a href="materialized-views-1.html#cb41-6" aria-hidden="true"></a>   (ar1.rc):<span class="ch">:integer</span> <span class="kw">AS</span> rc,</span>
-<span id="cb41-7"><a href="materialized-views-1.html#cb41-7" aria-hidden="true"></a>   (ar2.drc):<span class="ch">:integer</span> <span class="kw">AS</span> drc</span>
-<span id="cb41-8"><a href="materialized-views-1.html#cb41-8" aria-hidden="true"></a>  <span class="kw">FROM</span> (((( <span class="kw">SELECT</span> achilles_results.data_source_id,</span>
-<span id="cb41-9"><a href="materialized-views-1.html#cb41-9" aria-hidden="true"></a>           achilles_results.analysis_id,</span>
-<span id="cb41-10"><a href="materialized-views-1.html#cb41-10" aria-hidden="true"></a>           achilles_results.stratum_1 <span class="kw">AS</span> concept_id,</span>
-<span id="cb41-11"><a href="materialized-views-1.html#cb41-11" aria-hidden="true"></a>           achilles_results.count_value <span class="kw">AS</span> rc</span>
-<span id="cb41-12"><a href="materialized-views-1.html#cb41-12" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results</span>
-<span id="cb41-13"><a href="materialized-views-1.html#cb41-13" aria-hidden="true"></a>         <span class="kw">WHERE</span> (achilles_results.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">401</span>):<span class="ch">:bigint</span>, (<span class="dv">601</span>):<span class="ch">:bigint</span>, (<span class="dv">701</span>):<span class="ch">:bigint</span>, (<span class="dv">801</span>):<span class="ch">:bigint</span>, (<span class="dv">1801</span>):<span class="ch">:bigint</span>, (<span class="dv">2101</span>):<span class="ch">:bigint</span>]))) ar1</span>
-<span id="cb41-14"><a href="materialized-views-1.html#cb41-14" aria-hidden="true"></a>    <span class="kw">JOIN</span> ( <span class="kw">SELECT</span> ar.data_source_id,</span>
-<span id="cb41-15"><a href="materialized-views-1.html#cb41-15" aria-hidden="true"></a>           ar.analysis_id,</span>
-<span id="cb41-16"><a href="materialized-views-1.html#cb41-16" aria-hidden="true"></a>           ar.stratum_1 <span class="kw">AS</span> concept_id,</span>
-<span id="cb41-17"><a href="materialized-views-1.html#cb41-17" aria-hidden="true"></a>           ar.count_value <span class="kw">AS</span> drc</span>
-<span id="cb41-18"><a href="materialized-views-1.html#cb41-18" aria-hidden="true"></a>          <span class="kw">FROM</span> achilles_results ar</span>
-<span id="cb41-19"><a href="materialized-views-1.html#cb41-19" aria-hidden="true"></a>         <span class="kw">WHERE</span> (ar.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (<span class="dt">ARRAY</span>[(<span class="dv">430</span>):<span class="ch">:bigint</span>, (<span class="dv">630</span>):<span class="ch">:bigint</span>, (<span class="dv">730</span>):<span class="ch">:bigint</span>, (<span class="dv">830</span>):<span class="ch">:bigint</span>, (<span class="dv">1830</span>):<span class="ch">:bigint</span>, (<span class="dv">2130</span>):<span class="ch">:bigint</span>]))) ar2 <span class="kw">ON</span> (((ar1.concept_id <span class="op">=</span> ar2.concept_id) <span class="kw">AND</span> (ar1.data_source_id <span class="op">=</span> ar2.data_source_id))))</span>
-<span id="cb41-20"><a href="materialized-views-1.html#cb41-20" aria-hidden="true"></a>    <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> ((ar1.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)))</span>
-<span id="cb41-21"><a href="materialized-views-1.html#cb41-21" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept concept <span class="kw">ON</span> ((ar1.concept_id <span class="op">=</span> (concept.concept_id):<span class="ch">:text</span>)))</span>
-<span id="cb41-22"><a href="materialized-views-1.html#cb41-22" aria-hidden="true"></a> <span class="kw">ORDER</span> <span class="kw">BY</span> ((ar2.drc):<span class="ch">:integer</span>) <span class="kw">DESC</span>;</span></code></pre></div>
+<div class="sourceCode" id="cb40"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb40-1"><a href="materialized-views-1.html#cb40-1" aria-hidden="true"></a><span class="kw">SELECT</span></span>
+<span id="cb40-2"><a href="materialized-views-1.html#cb40-2" aria-hidden="true"></a>  <span class="kw">source</span>.acronym,</span>
+<span id="cb40-3"><a href="materialized-views-1.html#cb40-3" aria-hidden="true"></a>  (</span>
+<span id="cb40-4"><a href="materialized-views-1.html#cb40-4" aria-hidden="true"></a>    (</span>
+<span id="cb40-5"><a href="materialized-views-1.html#cb40-5" aria-hidden="true"></a>      (</span>
+<span id="cb40-6"><a href="materialized-views-1.html#cb40-6" aria-hidden="true"></a>        (</span>
+<span id="cb40-7"><a href="materialized-views-1.html#cb40-7" aria-hidden="true"></a><span class="st">&#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39;</span> :: text</span>
+<span id="cb40-8"><a href="materialized-views-1.html#cb40-8" aria-hidden="true"></a>          <span class="op">||</span> ar1.concept_id</span>
+<span id="cb40-9"><a href="materialized-views-1.html#cb40-9" aria-hidden="true"></a>        ) <span class="op">||</span> <span class="st">&#39;&quot;target=&quot;_blank&quot;&gt;&#39;</span> :: text</span>
+<span id="cb40-10"><a href="materialized-views-1.html#cb40-10" aria-hidden="true"></a>      ) <span class="op">||</span> ar1.concept_id</span>
+<span id="cb40-11"><a href="materialized-views-1.html#cb40-11" aria-hidden="true"></a>    ) <span class="op">||</span> <span class="st">&#39;&lt;/a&gt;&#39;</span> :: text</span>
+<span id="cb40-12"><a href="materialized-views-1.html#cb40-12" aria-hidden="true"></a>  ) <span class="kw">AS</span> concept_id,</span>
+<span id="cb40-13"><a href="materialized-views-1.html#cb40-13" aria-hidden="true"></a>  concept.concept_name,</span>
+<span id="cb40-14"><a href="materialized-views-1.html#cb40-14" aria-hidden="true"></a>  concept.domain_id,</span>
+<span id="cb40-15"><a href="materialized-views-1.html#cb40-15" aria-hidden="true"></a>  (ar1.rc):: <span class="dt">integer</span> <span class="kw">AS</span> rc,</span>
+<span id="cb40-16"><a href="materialized-views-1.html#cb40-16" aria-hidden="true"></a>  (ar2.drc):: <span class="dt">integer</span> <span class="kw">AS</span> drc</span>
+<span id="cb40-17"><a href="materialized-views-1.html#cb40-17" aria-hidden="true"></a><span class="kw">FROM</span></span>
+<span id="cb40-18"><a href="materialized-views-1.html#cb40-18" aria-hidden="true"></a>  (</span>
+<span id="cb40-19"><a href="materialized-views-1.html#cb40-19" aria-hidden="true"></a>    (</span>
+<span id="cb40-20"><a href="materialized-views-1.html#cb40-20" aria-hidden="true"></a>      (</span>
+<span id="cb40-21"><a href="materialized-views-1.html#cb40-21" aria-hidden="true"></a>        (</span>
+<span id="cb40-22"><a href="materialized-views-1.html#cb40-22" aria-hidden="true"></a>          <span class="kw">SELECT</span></span>
+<span id="cb40-23"><a href="materialized-views-1.html#cb40-23" aria-hidden="true"></a>            achilles_results.data_source_id,</span>
+<span id="cb40-24"><a href="materialized-views-1.html#cb40-24" aria-hidden="true"></a>            achilles_results.analysis_id,</span>
+<span id="cb40-25"><a href="materialized-views-1.html#cb40-25" aria-hidden="true"></a>            achilles_results.stratum_1 <span class="kw">AS</span> concept_id,</span>
+<span id="cb40-26"><a href="materialized-views-1.html#cb40-26" aria-hidden="true"></a>            achilles_results.count_value <span class="kw">AS</span> rc</span>
+<span id="cb40-27"><a href="materialized-views-1.html#cb40-27" aria-hidden="true"></a>          <span class="kw">FROM</span></span>
+<span id="cb40-28"><a href="materialized-views-1.html#cb40-28" aria-hidden="true"></a>            achilles_results</span>
+<span id="cb40-29"><a href="materialized-views-1.html#cb40-29" aria-hidden="true"></a>          <span class="kw">WHERE</span></span>
+<span id="cb40-30"><a href="materialized-views-1.html#cb40-30" aria-hidden="true"></a>            (</span>
+<span id="cb40-31"><a href="materialized-views-1.html#cb40-31" aria-hidden="true"></a>              achilles_results.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb40-32"><a href="materialized-views-1.html#cb40-32" aria-hidden="true"></a>                <span class="dt">ARRAY</span>[(<span class="dv">401</span>):: bigint,</span>
+<span id="cb40-33"><a href="materialized-views-1.html#cb40-33" aria-hidden="true"></a>                (<span class="dv">601</span>):: bigint,</span>
+<span id="cb40-34"><a href="materialized-views-1.html#cb40-34" aria-hidden="true"></a>                (<span class="dv">701</span>):: bigint,</span>
+<span id="cb40-35"><a href="materialized-views-1.html#cb40-35" aria-hidden="true"></a>                (<span class="dv">801</span>):: bigint,</span>
+<span id="cb40-36"><a href="materialized-views-1.html#cb40-36" aria-hidden="true"></a>                (<span class="dv">1801</span>):: bigint,</span>
+<span id="cb40-37"><a href="materialized-views-1.html#cb40-37" aria-hidden="true"></a>                (<span class="dv">2101</span>):: bigint]</span>
+<span id="cb40-38"><a href="materialized-views-1.html#cb40-38" aria-hidden="true"></a>              )</span>
+<span id="cb40-39"><a href="materialized-views-1.html#cb40-39" aria-hidden="true"></a>            )</span>
+<span id="cb40-40"><a href="materialized-views-1.html#cb40-40" aria-hidden="true"></a>        ) ar1</span>
+<span id="cb40-41"><a href="materialized-views-1.html#cb40-41" aria-hidden="true"></a>        <span class="kw">JOIN</span> (</span>
+<span id="cb40-42"><a href="materialized-views-1.html#cb40-42" aria-hidden="true"></a>          <span class="kw">SELECT</span></span>
+<span id="cb40-43"><a href="materialized-views-1.html#cb40-43" aria-hidden="true"></a>            ar.data_source_id,</span>
+<span id="cb40-44"><a href="materialized-views-1.html#cb40-44" aria-hidden="true"></a>            ar.analysis_id,</span>
+<span id="cb40-45"><a href="materialized-views-1.html#cb40-45" aria-hidden="true"></a>            ar.stratum_1 <span class="kw">AS</span> concept_id,</span>
+<span id="cb40-46"><a href="materialized-views-1.html#cb40-46" aria-hidden="true"></a>            ar.count_value <span class="kw">AS</span> drc</span>
+<span id="cb40-47"><a href="materialized-views-1.html#cb40-47" aria-hidden="true"></a>          <span class="kw">FROM</span></span>
+<span id="cb40-48"><a href="materialized-views-1.html#cb40-48" aria-hidden="true"></a>            achilles_results ar</span>
+<span id="cb40-49"><a href="materialized-views-1.html#cb40-49" aria-hidden="true"></a>          <span class="kw">WHERE</span></span>
+<span id="cb40-50"><a href="materialized-views-1.html#cb40-50" aria-hidden="true"></a>            (</span>
+<span id="cb40-51"><a href="materialized-views-1.html#cb40-51" aria-hidden="true"></a>              ar.analysis_id <span class="op">=</span> <span class="kw">ANY</span> (</span>
+<span id="cb40-52"><a href="materialized-views-1.html#cb40-52" aria-hidden="true"></a>                <span class="dt">ARRAY</span>[(<span class="dv">430</span>):: bigint,</span>
+<span id="cb40-53"><a href="materialized-views-1.html#cb40-53" aria-hidden="true"></a>                (<span class="dv">630</span>):: bigint,</span>
+<span id="cb40-54"><a href="materialized-views-1.html#cb40-54" aria-hidden="true"></a>                (<span class="dv">730</span>):: bigint,</span>
+<span id="cb40-55"><a href="materialized-views-1.html#cb40-55" aria-hidden="true"></a>                (<span class="dv">830</span>):: bigint,</span>
+<span id="cb40-56"><a href="materialized-views-1.html#cb40-56" aria-hidden="true"></a>                (<span class="dv">1830</span>):: bigint,</span>
+<span id="cb40-57"><a href="materialized-views-1.html#cb40-57" aria-hidden="true"></a>                (<span class="dv">2130</span>):: bigint]</span>
+<span id="cb40-58"><a href="materialized-views-1.html#cb40-58" aria-hidden="true"></a>              )</span>
+<span id="cb40-59"><a href="materialized-views-1.html#cb40-59" aria-hidden="true"></a>            )</span>
+<span id="cb40-60"><a href="materialized-views-1.html#cb40-60" aria-hidden="true"></a>        ) ar2 <span class="kw">ON</span> (</span>
+<span id="cb40-61"><a href="materialized-views-1.html#cb40-61" aria-hidden="true"></a>          (</span>
+<span id="cb40-62"><a href="materialized-views-1.html#cb40-62" aria-hidden="true"></a>            (ar1.concept_id <span class="op">=</span> ar2.concept_id)</span>
+<span id="cb40-63"><a href="materialized-views-1.html#cb40-63" aria-hidden="true"></a>            <span class="kw">AND</span> (</span>
+<span id="cb40-64"><a href="materialized-views-1.html#cb40-64" aria-hidden="true"></a>              ar1.data_source_id <span class="op">=</span> ar2.data_source_id</span>
+<span id="cb40-65"><a href="materialized-views-1.html#cb40-65" aria-hidden="true"></a>            )</span>
+<span id="cb40-66"><a href="materialized-views-1.html#cb40-66" aria-hidden="true"></a>          )</span>
+<span id="cb40-67"><a href="materialized-views-1.html#cb40-67" aria-hidden="true"></a>        )</span>
+<span id="cb40-68"><a href="materialized-views-1.html#cb40-68" aria-hidden="true"></a>      )</span>
+<span id="cb40-69"><a href="materialized-views-1.html#cb40-69" aria-hidden="true"></a>      <span class="kw">JOIN</span> data_source <span class="kw">source</span> <span class="kw">ON</span> (</span>
+<span id="cb40-70"><a href="materialized-views-1.html#cb40-70" aria-hidden="true"></a>        (ar1.data_source_id <span class="op">=</span> <span class="kw">source</span>.<span class="kw">id</span>)</span>
+<span id="cb40-71"><a href="materialized-views-1.html#cb40-71" aria-hidden="true"></a>      )</span>
+<span id="cb40-72"><a href="materialized-views-1.html#cb40-72" aria-hidden="true"></a>    )</span>
+<span id="cb40-73"><a href="materialized-views-1.html#cb40-73" aria-hidden="true"></a>    <span class="kw">JOIN</span> concept concept <span class="kw">ON</span> (</span>
+<span id="cb40-74"><a href="materialized-views-1.html#cb40-74" aria-hidden="true"></a>      (</span>
+<span id="cb40-75"><a href="materialized-views-1.html#cb40-75" aria-hidden="true"></a>        ar1.concept_id <span class="op">=</span> (concept.concept_id):: text</span>
+<span id="cb40-76"><a href="materialized-views-1.html#cb40-76" aria-hidden="true"></a>      )</span>
+<span id="cb40-77"><a href="materialized-views-1.html#cb40-77" aria-hidden="true"></a>    )</span>
+<span id="cb40-78"><a href="materialized-views-1.html#cb40-78" aria-hidden="true"></a>  )</span>
+<span id="cb40-79"><a href="materialized-views-1.html#cb40-79" aria-hidden="true"></a><span class="kw">ORDER</span> <span class="kw">BY</span> ((ar2.drc):: <span class="dt">integer</span>) <span class="kw">DESC</span>;</span></code></pre></div>
 
 </div>
 </div>
diff --git a/docs/materialized-views.md b/docs/materialized-views.md
index fb7d069f..bf3f3c71 100644
--- a/docs/materialized-views.md
+++ b/docs/materialized-views.md
@@ -17,11 +17,12 @@ SELECT data_source.acronym,
     JOIN data_source ON ((a.data_source_id = data_source.id)))
     JOIN country ON ((data_source.country_id = country.id)))
     JOIN ( SELECT achilles_results.count_value,
-           achilles_results.data_source_id,
-           achilles_results.stratum_2,
-           achilles_results.stratum_3
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = 0)) p ON ((p.data_source_id = data_source.id)))
+            achilles_results.data_source_id,
+            achilles_results.stratum_2,
+            achilles_results.stratum_3
+           FROM achilles_results
+           WHERE (achilles_results.analysis_id = 0)) p
+      ON p.data_source_id = data_source.id)
  WHERE (a.analysis_id = 5000);
 ```
 
@@ -31,9 +32,10 @@ SELECT data_source.acronym,
 SELECT country.country,
    source.database_type,
    achilles.count_value
-  FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
-    JOIN country country ON ((source.country_id = country.id)))
+  FROM (
+    (achilles_results achilles JOIN data_source source
+      ON (achilles.data_source_id = source.id))
+    JOIN country country ON source.country_id = country.id)
  WHERE (achilles.analysis_id = 1);
 ```
 
@@ -45,8 +47,8 @@ SELECT achilles_results.count_value,
    data_source.acronym,
    data_source.database_type,
    country.country
-  FROM ((achilles_results
-    JOIN data_source ON ((achilles_results.data_source_id = data_source.id)))
+  FROM ((achilles_results JOIN data_source
+      ON ((achilles_results.data_source_id = data_source.id)))
     JOIN country ON ((data_source.country_id = country.id)))
  WHERE (achilles_results.analysis_id = 1);
 ```
@@ -61,9 +63,11 @@ SELECT source.name,
    concept.concept_name AS gender,
    achilles.count_value
   FROM (((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
-    JOIN concept ON ((achilles.stratum_1 = (concept.concept_id)::text)))
+    JOIN concept
+      ON ((achilles.stratum_1 = (concept.concept_id)::text)))
  WHERE (achilles.analysis_id = 2);
 ```
 
@@ -75,61 +79,107 @@ SELECT source.name,
    source.database_type,
    country.country,
    sum(
-       CASE
-           WHEN ((achilles.stratum_2)::integer < 10) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "0-10",
+     CASE WHEN (
+       (achilles.stratum_2):: integer < 10
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "0-10", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 10) AND ((achilles.stratum_2)::integer < 20)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "10-20",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 10
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 20
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "10-20", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 20) AND ((achilles.stratum_2)::integer < 30)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "20-30",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 20
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 30
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "20-30", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 30) AND ((achilles.stratum_2)::integer < 40)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "30-40",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 30
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 40
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "30-40", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 40) AND ((achilles.stratum_2)::integer < 50)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "40-50",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 40
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 50
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "40-50", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 50) AND ((achilles.stratum_2)::integer < 60)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "50-60",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 50
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 60
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "50-60", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 60) AND ((achilles.stratum_2)::integer < 70)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "60-70",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 60
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 70
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "60-70", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 70) AND ((achilles.stratum_2)::integer < 80)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "70-80",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 70
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 80
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "70-80", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 80) AND ((achilles.stratum_2)::integer < 90)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "80-90",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 80
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 90
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "80-90", 
    sum(
-       CASE
-           WHEN ((achilles.stratum_2)::integer >= 90) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "90+"
+     CASE WHEN (
+       (achilles.stratum_2):: integer >= 90
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "90+" 
   FROM (((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
-    JOIN concept ON ((achilles.stratum_1 = (concept.concept_id)::text)))
+    JOIN concept
+      ON ((achilles.stratum_1 = (concept.concept_id)::text)))
  WHERE (achilles.analysis_id = 102)
- GROUP BY source.name, source.acronym, source.database_type, country.country;
+ GROUP BY 
+   source.name, 
+   source.acronym, 
+   source.database_type, 
+   country.country;
 ```
 
 ### age1observation_bar_chart {-}
@@ -142,7 +192,8 @@ SELECT source.name,
    source.database_type,
    country.country
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON achilles.data_source_id = source.id)
     JOIN country ON ((country.id = source.country_id)))
  WHERE (achilles.analysis_id = 101);
 ```
@@ -162,7 +213,8 @@ SELECT source.name,
    achilles.max_value,
    achilles.min_value
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((source.country_id = country.id)))
  WHERE (achilles.analysis_id = 103)
  ORDER BY source.name;
@@ -178,7 +230,8 @@ SELECT source.name,
    achilles.stratum_1 AS "Birth_year",
    achilles.count_value AS count
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
  WHERE (achilles.analysis_id = 3);
 ```
@@ -191,27 +244,58 @@ SELECT source.name,
    source.database_type,
    country.country,
        CASE
-           WHEN (achilles.analysis_id = 201) THEN 'Visit'::text
-           WHEN (achilles.analysis_id = 401) THEN 'Condition'::text
-           WHEN (achilles.analysis_id = 501) THEN 'Death'::text
-           WHEN (achilles.analysis_id = 601) THEN 'Procedure'::text
-           WHEN (achilles.analysis_id = 701) THEN 'Drug Exposure'::text
-           WHEN (achilles.analysis_id = 801) THEN 'Observation'::text
-           WHEN (achilles.analysis_id = 1801) THEN 'Measurement'::text
-           WHEN (achilles.analysis_id = 2101) THEN 'Device'::text
-           WHEN (achilles.analysis_id = 2201) THEN 'Note'::text
+           WHEN (achilles.analysis_id = 201)
+             THEN 'Visit'::text
+           WHEN (achilles.analysis_id = 401)
+             THEN 'Condition'::text
+           WHEN (achilles.analysis_id = 501)
+             THEN 'Death'::text
+           WHEN (achilles.analysis_id = 601)
+             THEN 'Procedure'::text
+           WHEN (achilles.analysis_id = 701)
+             THEN 'Drug Exposure'::text
+           WHEN (achilles.analysis_id = 801)
+             THEN 'Observation'::text
+           WHEN (achilles.analysis_id = 1801)
+             THEN 'Measurement'::text
+           WHEN (achilles.analysis_id = 2101)
+             THEN 'Device'::text
+           WHEN (achilles.analysis_id = 2201)
+             THEN 'Note'::text
            ELSE NULL::text
        END AS data_domain,
-   (sum(achilles.count_value) / avg(counts.num_persons)) AS records_per_person
+   (sum(achilles.count_value) / avg(counts.num_persons))
+     AS records_per_person
   FROM (((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
     JOIN ( SELECT achilles_results.data_source_id,
            achilles_results.count_value AS num_persons
           FROM achilles_results
-         WHERE (achilles_results.analysis_id = 1)) counts ON ((achilles.data_source_id = counts.data_source_id)))
- GROUP BY achilles.analysis_id, source.name, source.acronym, source.database_type, country.country
-HAVING (achilles.analysis_id = ANY (ARRAY[(201)::bigint, (401)::bigint, (501)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint, (2201)::bigint]));
+         WHERE (achilles_results.analysis_id = 1)) counts
+           ON achilles.data_source_id = counts.data_source_id)
+ GROUP BY
+   achilles.analysis_id,
+   source.name,
+   source.acronym,
+   source.database_type,
+   country.country
+HAVING
+  (
+    achilles.analysis_id = ANY (
+      ARRAY[(201):: bigint,
+      (401):: bigint,
+      (501):: bigint,
+      (601):: bigint,
+      (701):: bigint,
+      (801):: bigint,
+      (1801):: bigint,
+      (2101):: bigint,
+      (2201):: bigint]
+    )
+  );
+
 ```
 
 ### data_domain_total_num_of_records {-}
@@ -222,23 +306,51 @@ SELECT data_source.name,
    data_source.database_type,
    country.country,
        CASE
-           WHEN (achilles_results.analysis_id = 201) THEN 'Visit'::text
-           WHEN (achilles_results.analysis_id = 401) THEN 'Condition'::text
-           WHEN (achilles_results.analysis_id = 501) THEN 'Death'::text
-           WHEN (achilles_results.analysis_id = 601) THEN 'Procedure'::text
-           WHEN (achilles_results.analysis_id = 701) THEN 'Drug Exposure'::text
-           WHEN (achilles_results.analysis_id = 801) THEN 'Observation'::text
-           WHEN (achilles_results.analysis_id = 1801) THEN 'Measurement'::text
-           WHEN (achilles_results.analysis_id = 2101) THEN 'Device'::text
-           WHEN (achilles_results.analysis_id = 2201) THEN 'Note'::text
+           WHEN (achilles_results.analysis_id = 201)
+             THEN 'Visit'::text
+           WHEN (achilles_results.analysis_id = 401)
+             THEN 'Condition'::text
+           WHEN (achilles_results.analysis_id = 501)
+             THEN 'Death'::text
+           WHEN (achilles_results.analysis_id = 601)
+             THEN 'Procedure'::text
+           WHEN (achilles_results.analysis_id = 701)
+             THEN 'Drug Exposure'::text
+           WHEN (achilles_results.analysis_id = 801)
+             THEN 'Observation'::text
+           WHEN (achilles_results.analysis_id = 1801)
+             THEN 'Measurement'::text
+           WHEN (achilles_results.analysis_id = 2101)
+             THEN 'Device'::text
+           WHEN (achilles_results.analysis_id = 2201)
+             THEN 'Note'::text
            ELSE NULL::text
        END AS data_domain,
    sum(achilles_results.count_value) AS count
   FROM ((achilles_results
-    JOIN data_source ON ((achilles_results.data_source_id = data_source.id)))
+    JOIN data_source
+      ON ((achilles_results.data_source_id = data_source.id)))
     JOIN country ON ((country.id = data_source.country_id)))
- GROUP BY data_source.name, data_source.acronym, data_source.database_type, country.country, achilles_results.analysis_id
-HAVING (achilles_results.analysis_id = ANY (ARRAY[(201)::bigint, (401)::bigint, (501)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint, (2201)::bigint]));
+ GROUP BY
+   data_source.name,
+   data_source.acronym,
+   data_source.database_type,
+   country.country,
+   achilles_results.analysis_id
+HAVING
+  (
+    achilles_results.analysis_id = ANY (
+      ARRAY[(201):: bigint,
+      (401):: bigint,
+      (501):: bigint,
+      (601):: bigint,
+      (701):: bigint,
+      (801):: bigint,
+      (1801):: bigint,
+      (2101):: bigint,
+      (2201):: bigint]
+    )
+  );
 ```
 
 ### number_of_distinct_per_person {-}
@@ -249,12 +361,18 @@ SELECT source.name,
    country.country,
    achilles.analysis_id,
        CASE
-           WHEN (achilles.analysis_id = 203) THEN 'Visit'::text
-           WHEN (achilles.analysis_id = 403) THEN 'Condition'::text
-           WHEN (achilles.analysis_id = 603) THEN 'Procedure'::text
-           WHEN (achilles.analysis_id = 703) THEN 'Drug Exposure'::text
-           WHEN (achilles.analysis_id = 803) THEN 'Observation'::text
-           WHEN (achilles.analysis_id = 1803) THEN 'Measurement'::text
+           WHEN (achilles.analysis_id = 203)
+             THEN 'Visit'::text
+           WHEN (achilles.analysis_id = 403)
+             THEN 'Condition'::text
+           WHEN (achilles.analysis_id = 603)
+             THEN 'Procedure'::text
+           WHEN (achilles.analysis_id = 703)
+             THEN 'Drug Exposure'::text
+           WHEN (achilles.analysis_id = 803)
+             THEN 'Observation'::text
+           WHEN (achilles.analysis_id = 1803)
+             THEN 'Measurement'::text
            ELSE NULL::text
        END AS data_domain,
    achilles.count_value,
@@ -266,9 +384,20 @@ SELECT source.name,
    achilles.p90_value AS p90,
    achilles.max_value
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((source.country_id = country.id)))
- WHERE (achilles.analysis_id = ANY (ARRAY[(203)::bigint, (403)::bigint, (603)::bigint, (703)::bigint, (803)::bigint, (183)::bigint]))
+ WHERE
+   (
+     achilles.analysis_id = ANY (
+       ARRAY[(203):: bigint,
+       (403):: bigint,
+       (603):: bigint,
+       (703):: bigint,
+       (803):: bigint,
+       (183):: bigint]
+     )
+   )
  ORDER BY source.name;
 ```
 
@@ -280,29 +409,58 @@ SELECT source.name,
    source.database_type,
    country.country,
        CASE
-           WHEN (achilles.analysis_id = 405) THEN 'Condition'::text
-           WHEN (achilles.analysis_id = 605) THEN 'Procedure'::text
-           WHEN (achilles.analysis_id = 705) THEN 'Drug'::text
-           WHEN (achilles.analysis_id = 805) THEN 'Observation'::text
-           WHEN (achilles.analysis_id = 1805) THEN 'Measurement'::text
-           WHEN (achilles.analysis_id = 2105) THEN 'Device'::text
+           WHEN (achilles.analysis_id = 405)
+             THEN 'Condition'::text
+           WHEN (achilles.analysis_id = 605)
+             THEN 'Procedure'::text
+           WHEN (achilles.analysis_id = 705)
+             THEN 'Drug'::text
+           WHEN (achilles.analysis_id = 805)
+             THEN 'Observation'::text
+           WHEN (achilles.analysis_id = 1805)
+             THEN 'Measurement'::text
+           WHEN (achilles.analysis_id = 2105)
+             THEN 'Device'::text
            ELSE 'Other'::text
        END AS domain_name,
    c1.concept_name,
    sum(achilles.count_value) AS num_records
   FROM (((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
-    JOIN concept c1 ON ((achilles.stratum_2 = (c1.concept_id)::text)))
- WHERE (achilles.analysis_id = ANY (ARRAY[(405)::bigint, (605)::bigint, (705)::bigint, (805)::bigint, (1805)::bigint, (2105)::bigint]))
- GROUP BY source.name, source.acronym, source.database_type, country.country, c1.concept_name,
+    JOIN concept c1
+      ON ((achilles.stratum_2 = (c1.concept_id)::text)))
+ WHERE
+   (
+     achilles.analysis_id = ANY (
+       ARRAY[(405):: bigint,
+       (605):: bigint,
+       (705):: bigint,
+       (805):: bigint,
+       (1805):: bigint,
+       (2105):: bigint]
+     )
+   )
+ GROUP BY
+   source.name,
+   source.acronym,
+   source.database_type,
+   country.country,
+   c1.concept_name,
        CASE
-           WHEN (achilles.analysis_id = 405) THEN 'Condition'::text
-           WHEN (achilles.analysis_id = 605) THEN 'Procedure'::text
-           WHEN (achilles.analysis_id = 705) THEN 'Drug'::text
-           WHEN (achilles.analysis_id = 805) THEN 'Observation'::text
-           WHEN (achilles.analysis_id = 1805) THEN 'Measurement'::text
-           WHEN (achilles.analysis_id = 2105) THEN 'Device'::text
+           WHEN (achilles.analysis_id = 405)
+             THEN 'Condition'::text
+           WHEN (achilles.analysis_id = 605)
+             THEN 'Procedure'::text
+           WHEN (achilles.analysis_id = 705)
+             THEN 'Drug'::text
+           WHEN (achilles.analysis_id = 805)
+             THEN 'Observation'::text
+           WHEN (achilles.analysis_id = 1805)
+             THEN 'Measurement'::text
+           WHEN (achilles.analysis_id = 2105)
+             THEN 'Device'::text
            ELSE 'Other'::text
        END;
 ```
@@ -317,7 +475,8 @@ SELECT source.name,
    to_date(achilles.stratum_1, 'YYYYMM'::text) AS date,
    achilles.count_value AS "Nr_patients"
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
  WHERE (achilles.analysis_id = 110);
 ```
@@ -325,24 +484,60 @@ SELECT source.name,
 ### cumulative_observation_time {-}
 
 ```sql
-SELECT data_source.name,
-   data_source.acronym,
-   data_source.database_type,
-   country.country,
-   cumulative_sums.xlengthofobservation,
-   round((cumulative_sums.cumulative_sum / (totals.total)::numeric), 5) AS ypercentpersons
-  FROM (((( SELECT achilles_results.data_source_id,
-           ((achilles_results.stratum_1)::integer * 30) AS xlengthofobservation,
-           sum(achilles_results.count_value) OVER (PARTITION BY achilles_results.data_source_id ORDER BY (achilles_results.stratum_1)::integer DESC) AS cumulative_sum
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = 108)) cumulative_sums
-    JOIN ( SELECT achilles_results.data_source_id,
-           achilles_results.count_value AS total
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = 1)) totals ON ((cumulative_sums.data_source_id = totals.data_source_id)))
-    JOIN data_source ON ((cumulative_sums.data_source_id = data_source.id)))
-    JOIN country ON ((country.id = data_source.country_id)))
- ORDER BY data_source.name, cumulative_sums.xlengthofobservation;
+SELECT
+  data_source.name,
+  data_source.acronym,
+  data_source.database_type,
+  country.country,
+  cumulative_sums.xlengthofobservation,
+  round(
+    (cumulative_sums.cumulative_sum / (totals.total):: numeric),
+    5
+  ) AS ypercentpersons
+FROM
+  (
+    (
+      (
+        (
+          SELECT
+            achilles_results.data_source_id,
+            (
+              (achilles_results.stratum_1):: integer * 30
+            ) AS xlengthofobservation,
+            sum(achilles_results.count_value) OVER (
+              PARTITION BY achilles_results.data_source_id
+              ORDER BY
+                (achilles_results.stratum_1):: integer DESC
+            ) AS cumulative_sum
+          FROM
+            achilles_results
+          WHERE
+            (
+              achilles_results.analysis_id = 108
+            )
+        ) cumulative_sums
+        JOIN (
+          SELECT
+            achilles_results.data_source_id,
+            achilles_results.count_value AS total
+          FROM
+            achilles_results
+          WHERE
+            (achilles_results.analysis_id = 1)
+        ) totals ON (
+          (
+            cumulative_sums.data_source_id = totals.data_source_id
+          )
+        )
+      )
+      JOIN data_source
+        ON ((cumulative_sums.data_source_id = data_source.id))
+    )
+    JOIN country ON ((country.id = data_source.country_id))
+  )
+ORDER BY
+  data_source.name,
+  cumulative_sums.xlengthofobservation;
 ```
 
 ### number_of_observation_periods {-}
@@ -355,14 +550,22 @@ SELECT ar.data_source_id AS id,
    ar.stratum_1,
    ar.count_value,
    pa.nrpatients AS patients,
-   round((((100)::numeric * (ar.count_value)::numeric) / (pa.nrpatients)::numeric), 2) AS percentage
+   round(
+     (
+       ((100)::numeric * (ar.count_value)::numeric)
+       /
+       (pa.nrpatients)::numeric
+     ),
+     2
+   ) AS percentage
   FROM (((achilles_results ar
     JOIN data_source ds ON ((ds.id = ar.data_source_id)))
     JOIN country ON ((ds.country_id = country.id)))
     JOIN ( SELECT achilles_results.count_value AS nrpatients,
            achilles_results.data_source_id
           FROM achilles_results
-         WHERE (achilles_results.analysis_id = 0)) pa ON ((pa.data_source_id = ds.id)))
+         WHERE (achilles_results.analysis_id = 0)) pa
+           ON ((pa.data_source_id = ds.id)))
  WHERE (ar.analysis_id = 113);
 ```
 
@@ -381,7 +584,8 @@ SELECT source.name,
    achilles.p90_value AS p90,
    achilles.max_value
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((source.country_id = country.id)))
  WHERE (achilles.analysis_id = 105)
  ORDER BY source.name;
@@ -415,10 +619,17 @@ SELECT data_source.name,
            achilles_results_1.p90_value,
            achilles_results_1.stdev_value
           FROM achilles_results achilles_results_1
-         WHERE (achilles_results_1.analysis_id = 200)) achilles_results
-    JOIN data_source ON ((achilles_results.data_source_id = data_source.id)))
+         WHERE (achilles_results_1.analysis_id = 200)
+         ) achilles_results
+    JOIN data_source
+      ON ((achilles_results.data_source_id = data_source.id)))
     JOIN country ON ((country.id = data_source.country_id)))
-    JOIN concept ON (((achilles_results.stratum_1)::integer = concept.concept_id)));
+    JOIN concept
+      ON
+        (achilles_results.stratum_1)::integer
+        =
+        concept.concept_id
+        );
 ```
 
 ### visit_type_table {-}
@@ -430,8 +641,22 @@ SELECT data_source.name,
    country.country,
    concept.concept_name,
    ar1.count_value AS num_persons,
-   round(((100.0 * (ar1.count_value)::numeric) / (denom.count_value)::numeric), 2) AS percent_persons,
-   round(((1.0 * (ar2.count_value)::numeric) / (ar1.count_value)::numeric), 2) AS records_per_person
+   round(
+     (
+       (100.0 * (ar1.count_value)::numeric)
+       /
+       (denom.count_value)::numeric
+     ),
+     2
+   ) AS percent_persons,
+   round(
+     (
+       (1.0 * (ar2.count_value)::numeric)
+       /
+       (ar1.count_value)::numeric
+     ),
+     2
+   ) AS records_per_person
   FROM (((((( SELECT achilles_results.id,
            achilles_results.analysis_id,
            achilles_results.stratum_1,
@@ -471,7 +696,9 @@ SELECT data_source.name,
            achilles_results.p90_value,
            achilles_results.stdev_value
           FROM achilles_results
-         WHERE (achilles_results.analysis_id = 201)) ar2 ON (((ar1.stratum_1 = ar2.stratum_1) AND (ar1.data_source_id = ar2.data_source_id))))
+         WHERE (achilles_results.analysis_id = 201)) ar2
+           ON (((ar1.stratum_1 = ar2.stratum_1)
+             AND (ar1.data_source_id = ar2.data_source_id))))
     JOIN ( SELECT achilles_results.id,
            achilles_results.analysis_id,
            achilles_results.stratum_1,
@@ -491,86 +718,264 @@ SELECT data_source.name,
            achilles_results.p90_value,
            achilles_results.stdev_value
           FROM achilles_results
-         WHERE (achilles_results.analysis_id = 1)) denom ON ((ar1.data_source_id = denom.data_source_id)))
+         WHERE (achilles_results.analysis_id = 1)) denom
+           ON ((ar1.data_source_id = denom.data_source_id)))
     JOIN data_source ON ((data_source.id = ar1.data_source_id)))
-    JOIN country ON ((country.id = data_source.country_id)))
-    JOIN concept ON (((ar1.stratum_1)::integer = concept.concept_id)))
+    JOIN country
+      ON ((country.id = data_source.country_id)))
+    JOIN concept
+      ON (((ar1.stratum_1)::integer = concept.concept_id)))
  ORDER BY ar1.data_source_id, ar1.count_value DESC;
 ```
 
 ### domain_filter {-}
 
 ```sql
-SELECT concept.concept_name,
-   concept.domain_id,
-   source.name,
-   source.acronym,
-   source.database_type,
-   country.country
-  FROM (((achilles_results
-    JOIN concept ON (((achilles_results.stratum_1)::bigint = concept.concept_id)))
-    JOIN data_source source ON ((achilles_results.data_source_id = source.id)))
-    JOIN country ON ((country.id = source.country_id)))
- WHERE (achilles_results.analysis_id = ANY (ARRAY[(201)::bigint, (401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (901)::bigint, (1001)::bigint, (1801)::bigint, (200)::bigint, (400)::bigint, (600)::bigint, (700)::bigint, (800)::bigint, (1800)::bigint]));
+SELECT
+  concept.concept_name,
+  concept.domain_id,
+  source.name,
+  source.acronym,
+  source.database_type,
+  country.country
+FROM
+  (
+    (
+      (
+        achilles_results
+        JOIN concept ON (
+          (
+            (achilles_results.stratum_1):: bigint
+            =
+            concept.concept_id
+          )
+        )
+      )
+      JOIN data_source source ON (
+        (
+          achilles_results.data_source_id = source.id
+        )
+      )
+    )
+    JOIN country ON (
+      (country.id = source.country_id)
+    )
+  )
+WHERE
+  (
+    achilles_results.analysis_id = ANY (
+      ARRAY[(201):: bigint,
+      (401):: bigint,
+      (601):: bigint,
+      (701):: bigint,
+      (801):: bigint,
+      (901):: bigint,
+      (1001):: bigint,
+      (1801):: bigint,
+      (200):: bigint,
+      (400):: bigint,
+      (600):: bigint,
+      (700):: bigint,
+      (800):: bigint,
+      (1800):: bigint]
+    )
+  );
 ```
 
 ### concept_browser_table3 {-}
 
 ```sql
-SELECT source.name,
-   source.acronym,
-   source.database_type,
-   country.country,
-   (((('<a href="https://athena.ohdsi.org/search-terms/terms/'::text || ar1.concept_id) || '"target="_blank">'::text) || ar1.concept_id) || '</a>'::text) AS concept_id,
-   concept.concept_name,
-   concept.domain_id,
-   (ar1.rc)::integer AS rc,
-   (ar2.drc)::integer AS drc
-  FROM ((((( SELECT achilles_results.data_source_id,
-           achilles_results.analysis_id,
-           achilles_results.stratum_1 AS concept_id,
-           achilles_results.count_value AS rc
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = ANY (ARRAY[(401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint]))) ar1
-    JOIN ( SELECT ar.data_source_id,
-           ar.analysis_id,
-           ar.stratum_1 AS concept_id,
-           ar.count_value AS drc
-          FROM achilles_results ar
-         WHERE (ar.analysis_id = ANY (ARRAY[(430)::bigint, (630)::bigint, (730)::bigint, (830)::bigint, (1830)::bigint, (2130)::bigint]))) ar2 ON (((ar1.concept_id = ar2.concept_id) AND (ar1.data_source_id = ar2.data_source_id))))
-    JOIN data_source source ON ((ar1.data_source_id = source.id)))
-    JOIN country ON ((source.country_id = country.id)))
-    JOIN concept concept ON ((ar1.concept_id = (concept.concept_id)::text)))
- ORDER BY ((ar2.drc)::integer) DESC;
+SELECT
+  source.name,
+  source.acronym,
+  source.database_type,
+  country.country,
+  (
+    (
+      (
+        (
+'<a href="https://athena.ohdsi.org/search-terms/terms/' :: text
+          || ar1.concept_id
+        ) || '"target="_blank">' :: text
+      ) || ar1.concept_id
+    ) || '</a>' :: text
+  ) AS concept_id,
+  concept.concept_name,
+  concept.domain_id,
+  (ar1.rc):: integer AS rc,
+  (ar2.drc):: integer AS drc
+FROM
+  (
+    (
+      (
+        (
+          (
+            SELECT
+              achilles_results.data_source_id,
+              achilles_results.analysis_id,
+              achilles_results.stratum_1 AS concept_id,
+              achilles_results.count_value AS rc
+            FROM
+              achilles_results
+            WHERE
+              (
+                achilles_results.analysis_id = ANY (
+                  ARRAY[(401):: bigint,
+                  (601):: bigint,
+                  (701):: bigint,
+                  (801):: bigint,
+                  (1801):: bigint,
+                  (2101):: bigint]
+                )
+              )
+          ) ar1
+          JOIN (
+            SELECT
+              ar.data_source_id,
+              ar.analysis_id,
+              ar.stratum_1 AS concept_id,
+              ar.count_value AS drc
+            FROM
+              achilles_results ar
+            WHERE
+              (
+                ar.analysis_id = ANY (
+                  ARRAY[(430):: bigint,
+                  (630):: bigint,
+                  (730):: bigint,
+                  (830):: bigint,
+                  (1830):: bigint,
+                  (2130):: bigint]
+                )
+              )
+          ) ar2 ON (
+            (
+              (ar1.concept_id = ar2.concept_id)
+              AND (
+                ar1.data_source_id = ar2.data_source_id
+              )
+            )
+          )
+        )
+        JOIN data_source source ON (
+          (ar1.data_source_id = source.id)
+        )
+      )
+      JOIN country ON (
+        (source.country_id = country.id)
+      )
+    )
+    JOIN concept concept ON (
+      (
+        ar1.concept_id = (concept.concept_id):: text
+      )
+    )
+  )
+ORDER BY
+  (
+    (ar2.drc):: integer
+  ) DESC;
 ```
 
 ### concept_coverage2 {-}
 
 ```sql
-SELECT source.name AS source_name,
-   source.database_type,
-   country.country,
-   (((('<a href="https://athena.ohdsi.org/search-terms/terms/'::text || concept.concept_id) || '" target="_blank">'::text) || concept.concept_id) || '</a>'::text) AS concept_id,
-   concept.concept_name,
-   concept.domain_id,
-   sum((ar1.rc)::integer) AS rc,
-   sum((ar2.drc)::integer) AS drc
-  FROM ((((( SELECT achilles_results.data_source_id,
-           achilles_results.analysis_id,
-           achilles_results.stratum_1 AS concept_id,
-           achilles_results.count_value AS rc
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = ANY (ARRAY[(401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint]))) ar1
-    JOIN ( SELECT ar.data_source_id,
-           ar.analysis_id,
-           ar.stratum_1 AS concept_id,
-           ar.count_value AS drc
-          FROM achilles_results ar
-         WHERE (ar.analysis_id = ANY (ARRAY[(430)::bigint, (630)::bigint, (730)::bigint, (830)::bigint, (1830)::bigint, (2130)::bigint]))) ar2 ON (((ar1.concept_id = ar2.concept_id) AND (ar1.data_source_id = ar2.data_source_id))))
-    JOIN data_source source ON ((ar1.data_source_id = source.id)))
-    JOIN country ON ((country.id = source.country_id)))
-    JOIN concept concept ON ((ar1.concept_id = (concept.concept_id)::text)))
- GROUP BY source.name, source.database_type, country.country, concept.domain_id, concept.concept_id, concept.concept_name;
+SELECT
+  source.name AS source_name,
+  source.database_type,
+  country.country,
+  (
+    (
+      (
+        (
+'<a href="https://athena.ohdsi.org/search-terms/terms/' :: text
+          || concept.concept_id
+        ) || '" target="_blank">' :: text
+      ) || concept.concept_id
+    ) || '</a>' :: text
+  ) AS concept_id,
+  concept.concept_name,
+  concept.domain_id,
+  sum(
+    (ar1.rc):: integer
+  ) AS rc,
+  sum(
+    (ar2.drc):: integer
+  ) AS drc
+FROM
+  (
+    (
+      (
+        (
+          (
+            SELECT
+              achilles_results.data_source_id,
+              achilles_results.analysis_id,
+              achilles_results.stratum_1 AS concept_id,
+              achilles_results.count_value AS rc
+            FROM
+              achilles_results
+            WHERE
+              (
+                achilles_results.analysis_id = ANY (
+                  ARRAY[(401):: bigint,
+                  (601):: bigint,
+                  (701):: bigint,
+                  (801):: bigint,
+                  (1801):: bigint,
+                  (2101):: bigint]
+                )
+              )
+          ) ar1
+          JOIN (
+            SELECT
+              ar.data_source_id,
+              ar.analysis_id,
+              ar.stratum_1 AS concept_id,
+              ar.count_value AS drc
+            FROM
+              achilles_results ar
+            WHERE
+              (
+                ar.analysis_id = ANY (
+                  ARRAY[(430):: bigint,
+                  (630):: bigint,
+                  (730):: bigint,
+                  (830):: bigint,
+                  (1830):: bigint,
+                  (2130):: bigint]
+                )
+              )
+          ) ar2 ON (
+            (
+              (ar1.concept_id = ar2.concept_id)
+              AND (
+                ar1.data_source_id = ar2.data_source_id
+              )
+            )
+          )
+        )
+        JOIN data_source source ON (
+          (ar1.data_source_id = source.id)
+        )
+      )
+      JOIN country ON (
+        (country.id = source.country_id)
+      )
+    )
+    JOIN concept concept ON (
+      (
+        ar1.concept_id = (concept.concept_id):: text
+      )
+    )
+  )
+GROUP BY
+  source.name,
+  source.database_type,
+  country.country,
+  concept.domain_id,
+  concept.concept_id,
+  concept.concept_name;
 ```
 
 ### data_density {-}
@@ -659,7 +1064,8 @@ SELECT source.acronym,
     JOIN data_source source ON ((source.id = t1.id)))
  ORDER BY t1.table_name, (
        CASE
-           WHEN (t1.stratum_1 ~ '^\d+\.?\d+$'::text) THEN t1.stratum_1
+           WHEN (t1.stratum_1 ~ '^\d+\.?\d+$'::text)
+             THEN t1.stratum_1
            ELSE NULL::text
        END)::integer;
 ```
@@ -670,7 +1076,14 @@ SELECT source.acronym,
 SELECT source.acronym,
    t1.table_name AS series_name,
    to_date(t1.stratum_1, 'YYYYMM'::text) AS x_calendar_month,
-   round(((1.0 * (t1.count_value)::numeric) / (denom.count_value)::numeric), 5) AS y_record_count
+   round(
+     (
+       (1.0 * (t1.count_value)::numeric)
+       /
+       (denom.count_value)::numeric
+     ),
+     5
+   ) AS y_record_count
   FROM ((( SELECT achilles_results.data_source_id AS id,
            'Visit occurrence'::text AS table_name,
            achilles_results.stratum_1,
@@ -766,11 +1179,14 @@ SELECT source.acronym,
            achilles_results.p90_value,
            achilles_results.stdev_value
           FROM achilles_results
-         WHERE (achilles_results.analysis_id = 117)) denom ON (((t1.stratum_1 = denom.stratum_1) AND (t1.id = denom.data_source_id))))
+         WHERE (achilles_results.analysis_id = 117)) denom
+           ON (((t1.stratum_1 = denom.stratum_1)
+             AND (t1.id = denom.data_source_id))))
     JOIN data_source source ON ((source.id = t1.id)))
  ORDER BY t1.table_name, (
        CASE
-           WHEN (t1.stratum_1 ~ '^\d+\.?\d+$'::text) THEN t1.stratum_1
+           WHEN (t1.stratum_1 ~ '^\d+\.?\d+$'::text)
+             THEN t1.stratum_1
            ELSE NULL::text
        END)::integer;
 ```
@@ -789,9 +1205,12 @@ SELECT source.name,
    achilles.p75_value AS p75,
    achilles.p90_value AS p90
   FROM (((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
-    JOIN concept c1 ON ((achilles.stratum_1 = (c1.concept_id)::text)))
-    JOIN concept c2 ON ((achilles.stratum_2 = (c2.concept_id)::text)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
+    JOIN concept c1
+      ON ((achilles.stratum_1 = (c1.concept_id)::text)))
+    JOIN concept c2
+      ON ((achilles.stratum_2 = (c2.concept_id)::text)))
  WHERE (achilles.analysis_id = 206)
  ORDER BY source.name, c1.concept_name, c2.concept_name;
 ```
@@ -800,25 +1219,82 @@ SELECT source.name,
 
 ```sql
 SELECT
-   source.acronym,
-   (((('<a href="https://athena.ohdsi.org/search-terms/terms/'::text || ar1.concept_id) || '"target="_blank">'::text) || ar1.concept_id) || '</a>'::text) AS concept_id,
-   concept.concept_name,
-   concept.domain_id,
-   (ar1.rc)::integer AS rc,
-   (ar2.drc)::integer AS drc
-  FROM (((( SELECT achilles_results.data_source_id,
-           achilles_results.analysis_id,
-           achilles_results.stratum_1 AS concept_id,
-           achilles_results.count_value AS rc
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = ANY (ARRAY[(401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint]))) ar1
-    JOIN ( SELECT ar.data_source_id,
-           ar.analysis_id,
-           ar.stratum_1 AS concept_id,
-           ar.count_value AS drc
-          FROM achilles_results ar
-         WHERE (ar.analysis_id = ANY (ARRAY[(430)::bigint, (630)::bigint, (730)::bigint, (830)::bigint, (1830)::bigint, (2130)::bigint]))) ar2 ON (((ar1.concept_id = ar2.concept_id) AND (ar1.data_source_id = ar2.data_source_id))))
-    JOIN data_source source ON ((ar1.data_source_id = source.id)))
-    JOIN concept concept ON ((ar1.concept_id = (concept.concept_id)::text)))
- ORDER BY ((ar2.drc)::integer) DESC;
+  source.acronym,
+  (
+    (
+      (
+        (
+'<a href="https://athena.ohdsi.org/search-terms/terms/' :: text
+          || ar1.concept_id
+        ) || '"target="_blank">' :: text
+      ) || ar1.concept_id
+    ) || '</a>' :: text
+  ) AS concept_id,
+  concept.concept_name,
+  concept.domain_id,
+  (ar1.rc):: integer AS rc,
+  (ar2.drc):: integer AS drc
+FROM
+  (
+    (
+      (
+        (
+          SELECT
+            achilles_results.data_source_id,
+            achilles_results.analysis_id,
+            achilles_results.stratum_1 AS concept_id,
+            achilles_results.count_value AS rc
+          FROM
+            achilles_results
+          WHERE
+            (
+              achilles_results.analysis_id = ANY (
+                ARRAY[(401):: bigint,
+                (601):: bigint,
+                (701):: bigint,
+                (801):: bigint,
+                (1801):: bigint,
+                (2101):: bigint]
+              )
+            )
+        ) ar1
+        JOIN (
+          SELECT
+            ar.data_source_id,
+            ar.analysis_id,
+            ar.stratum_1 AS concept_id,
+            ar.count_value AS drc
+          FROM
+            achilles_results ar
+          WHERE
+            (
+              ar.analysis_id = ANY (
+                ARRAY[(430):: bigint,
+                (630):: bigint,
+                (730):: bigint,
+                (830):: bigint,
+                (1830):: bigint,
+                (2130):: bigint]
+              )
+            )
+        ) ar2 ON (
+          (
+            (ar1.concept_id = ar2.concept_id)
+            AND (
+              ar1.data_source_id = ar2.data_source_id
+            )
+          )
+        )
+      )
+      JOIN data_source source ON (
+        (ar1.data_source_id = source.id)
+      )
+    )
+    JOIN concept concept ON (
+      (
+        ar1.concept_id = (concept.concept_id):: text
+      )
+    )
+  )
+ORDER BY ((ar2.drc):: integer) DESC;
 ```
diff --git a/docs/observation-period-deprecated.html b/docs/observation-period-deprecated.html
index 61adbb2f..f67a2dc5 100644
--- a/docs/observation-period-deprecated.html
+++ b/docs/observation-period-deprecated.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -329,9 +329,9 @@ <h2><span class="header-section-number">9.6</span> Observation Period [Deprecate
 <div id="css-4" class="section level3 unnumbered" number="">
 <h3>CSS</h3>
 <p>To hide the dashboard header insert the following css code to the <code>CSS</code> field on the edit page:</p>
-<div class="sourceCode" id="cb55"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb55-1"><a href="observation-period-deprecated.html#cb55-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
-<span id="cb55-2"><a href="observation-period-deprecated.html#cb55-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb55-3"><a href="observation-period-deprecated.html#cb55-3" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb54"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb54-1"><a href="observation-period-deprecated.html#cb54-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
+<span id="cb54-2"><a href="observation-period-deprecated.html#cb54-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb54-3"><a href="observation-period-deprecated.html#cb54-3" aria-hidden="true"></a>}</span></code></pre></div>
 <p>With this every time you want to edit the dashboard layout you have to either comment the CSS inserted
 or remove it so the “Edit Dashboard” button can show again.</p>
 </div>
@@ -374,8 +374,8 @@ <h4>Chart settings</h4>
 </ul>
 </div>
 </div>
-<div id="number-of-patients-in-observation-period-numinobservationperiod" class="section level3 unnumbered" number="">
-<h3>Number of Patients in Observation Period {#numInObservationPeriod}</h3>
+<div id="numInObservationPeriod" class="section level3 unnumbered" number="">
+<h3>Number of Patients in Observation Period</h3>
 <p>The Number of Patients in Observation Period plot shows the number of patients that contribute at least one day in a specific month.</p>
 <div class="figure"><span style="display:block;" id="fig:numPatientsInObserPeriod"></span>
 <img src="images/05-observation_period/02-number_of_patients_in_observation_period.png" alt="Settings for creating the Number of Patients in Observation Period chart" width="100%" />
@@ -385,13 +385,14 @@ <h3>Number of Patients in Observation Period {#numInObservationPeriod}</h3>
 </div>
 <div id="sql-query-12" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb56"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb56-1"><a href="observation-period-deprecated.html#cb56-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb56-2"><a href="observation-period-deprecated.html#cb56-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
-<span id="cb56-3"><a href="observation-period-deprecated.html#cb56-3" aria-hidden="true"></a>       <span class="fu">to_date</span>(stratum_1, <span class="st">&#39;YYYYMM&#39;</span>) <span class="kw">as</span> <span class="dt">Date</span>,</span>
-<span id="cb56-4"><a href="observation-period-deprecated.html#cb56-4" aria-hidden="true"></a>       count_value</span>
-<span id="cb56-5"><a href="observation-period-deprecated.html#cb56-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb56-6"><a href="observation-period-deprecated.html#cb56-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb56-7"><a href="observation-period-deprecated.html#cb56-7" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">110</span></span></code></pre></div>
+<div class="sourceCode" id="cb55"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb55-1"><a href="observation-period-deprecated.html#cb55-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb55-2"><a href="observation-period-deprecated.html#cb55-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
+<span id="cb55-3"><a href="observation-period-deprecated.html#cb55-3" aria-hidden="true"></a>       <span class="fu">to_date</span>(stratum_1, <span class="st">&#39;YYYYMM&#39;</span>) <span class="kw">as</span> <span class="dt">Date</span>,</span>
+<span id="cb55-4"><a href="observation-period-deprecated.html#cb55-4" aria-hidden="true"></a>       count_value</span>
+<span id="cb55-5"><a href="observation-period-deprecated.html#cb55-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb55-6"><a href="observation-period-deprecated.html#cb55-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb55-7"><a href="observation-period-deprecated.html#cb55-7" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb55-8"><a href="observation-period-deprecated.html#cb55-8" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">110</span></span></code></pre></div>
 </div>
 <div id="chart-settings-13" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -440,13 +441,14 @@ <h3>Observation Period Start Dates</h3>
 </div>
 <div id="sql-query-13" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb57"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb57-1"><a href="observation-period-deprecated.html#cb57-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb57-2"><a href="observation-period-deprecated.html#cb57-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
-<span id="cb57-3"><a href="observation-period-deprecated.html#cb57-3" aria-hidden="true"></a>       <span class="fu">to_date</span>(stratum_1, <span class="st">&#39;YYYYMM&#39;</span>) <span class="kw">AS</span> year_month,</span>
-<span id="cb57-4"><a href="observation-period-deprecated.html#cb57-4" aria-hidden="true"></a>       count_value</span>
-<span id="cb57-5"><a href="observation-period-deprecated.html#cb57-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb57-6"><a href="observation-period-deprecated.html#cb57-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb57-7"><a href="observation-period-deprecated.html#cb57-7" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">111</span></span></code></pre></div>
+<div class="sourceCode" id="cb56"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb56-1"><a href="observation-period-deprecated.html#cb56-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb56-2"><a href="observation-period-deprecated.html#cb56-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
+<span id="cb56-3"><a href="observation-period-deprecated.html#cb56-3" aria-hidden="true"></a>       <span class="fu">to_date</span>(stratum_1, <span class="st">&#39;YYYYMM&#39;</span>) <span class="kw">AS</span> year_month,</span>
+<span id="cb56-4"><a href="observation-period-deprecated.html#cb56-4" aria-hidden="true"></a>       count_value</span>
+<span id="cb56-5"><a href="observation-period-deprecated.html#cb56-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb56-6"><a href="observation-period-deprecated.html#cb56-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb56-7"><a href="observation-period-deprecated.html#cb56-7" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb56-8"><a href="observation-period-deprecated.html#cb56-8" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">111</span></span></code></pre></div>
 </div>
 <div id="chart-settings-14" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -495,13 +497,14 @@ <h3>Observation Period End Dates</h3>
 </div>
 <div id="sql-query-14" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb58"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb58-1"><a href="observation-period-deprecated.html#cb58-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb58-2"><a href="observation-period-deprecated.html#cb58-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
-<span id="cb58-3"><a href="observation-period-deprecated.html#cb58-3" aria-hidden="true"></a>       <span class="fu">to_date</span>(stratum_1, <span class="st">&#39;YYYYMM&#39;</span>) <span class="kw">AS</span> year_month,</span>
-<span id="cb58-4"><a href="observation-period-deprecated.html#cb58-4" aria-hidden="true"></a>       count_value</span>
-<span id="cb58-5"><a href="observation-period-deprecated.html#cb58-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb58-6"><a href="observation-period-deprecated.html#cb58-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb58-7"><a href="observation-period-deprecated.html#cb58-7" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">112</span></span></code></pre></div>
+<div class="sourceCode" id="cb57"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb57-1"><a href="observation-period-deprecated.html#cb57-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb57-2"><a href="observation-period-deprecated.html#cb57-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
+<span id="cb57-3"><a href="observation-period-deprecated.html#cb57-3" aria-hidden="true"></a>       <span class="fu">to_date</span>(stratum_1, <span class="st">&#39;YYYYMM&#39;</span>) <span class="kw">AS</span> year_month,</span>
+<span id="cb57-4"><a href="observation-period-deprecated.html#cb57-4" aria-hidden="true"></a>       count_value</span>
+<span id="cb57-5"><a href="observation-period-deprecated.html#cb57-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb57-6"><a href="observation-period-deprecated.html#cb57-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb57-7"><a href="observation-period-deprecated.html#cb57-7" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb57-8"><a href="observation-period-deprecated.html#cb57-8" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">112</span></span></code></pre></div>
 </div>
 <div id="chart-settings-15" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
diff --git a/docs/person-deprecated.html b/docs/person-deprecated.html
index 64f2f86c..dea671e6 100644
--- a/docs/person-deprecated.html
+++ b/docs/person-deprecated.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -329,17 +329,17 @@ <h2><span class="header-section-number">9.5</span> Person [Deprecated]</h2>
 <h3>Label Colors</h3>
 <p>In order to obtain the colors blue and rose in the chart representing the gender distribution,
 add the following JSON entry to the JSON object of the <code>JSON Metadata</code> field on the edit dashboard page:</p>
-<div class="sourceCode" id="cb49"><pre class="sourceCode json"><code class="sourceCode json"><span id="cb49-1"><a href="person-deprecated.html#cb49-1" aria-hidden="true"></a><span class="er">&quot;label_colors&quot;:</span> <span class="fu">{</span></span>
-<span id="cb49-2"><a href="person-deprecated.html#cb49-2" aria-hidden="true"></a>    <span class="dt">&quot;Male&quot;</span><span class="fu">:</span> <span class="st">&quot;#3366FF&quot;</span><span class="fu">,</span> </span>
-<span id="cb49-3"><a href="person-deprecated.html#cb49-3" aria-hidden="true"></a>    <span class="dt">&quot;Female&quot;</span><span class="fu">:</span> <span class="st">&quot;#FF3399&quot;</span></span>
-<span id="cb49-4"><a href="person-deprecated.html#cb49-4" aria-hidden="true"></a><span class="fu">}</span></span></code></pre></div>
+<div class="sourceCode" id="cb48"><pre class="sourceCode json"><code class="sourceCode json"><span id="cb48-1"><a href="person-deprecated.html#cb48-1" aria-hidden="true"></a><span class="er">&quot;label_colors&quot;:</span> <span class="fu">{</span></span>
+<span id="cb48-2"><a href="person-deprecated.html#cb48-2" aria-hidden="true"></a>    <span class="dt">&quot;Male&quot;</span><span class="fu">:</span> <span class="st">&quot;#3366FF&quot;</span><span class="fu">,</span> </span>
+<span id="cb48-3"><a href="person-deprecated.html#cb48-3" aria-hidden="true"></a>    <span class="dt">&quot;Female&quot;</span><span class="fu">:</span> <span class="st">&quot;#FF3399&quot;</span></span>
+<span id="cb48-4"><a href="person-deprecated.html#cb48-4" aria-hidden="true"></a><span class="fu">}</span></span></code></pre></div>
 </div>
 <div id="css-3" class="section level3 unnumbered" number="">
 <h3>CSS</h3>
 <p>To hide the dashboard header insert the following css code to the <code>CSS</code> field on the edit page:</p>
-<div class="sourceCode" id="cb50"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb50-1"><a href="person-deprecated.html#cb50-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
-<span id="cb50-2"><a href="person-deprecated.html#cb50-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb50-3"><a href="person-deprecated.html#cb50-3" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb49"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb49-1"><a href="person-deprecated.html#cb49-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
+<span id="cb49-2"><a href="person-deprecated.html#cb49-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb49-3"><a href="person-deprecated.html#cb49-3" aria-hidden="true"></a>}</span></code></pre></div>
 <p>With this every time you want to edit the dashboard layout you have to either comment the CSS inserted
 or remove it so the “Edit Dashboard” button can show again.</p>
 </div>
@@ -392,23 +392,43 @@ <h3>Age at first observation - Table {#age1ObservationTable}</h3>
 </div>
 <div id="sql-query-7" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb51"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb51-1"><a href="person-deprecated.html#cb51-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb51-2"><a href="person-deprecated.html#cb51-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
-<span id="cb51-3"><a href="person-deprecated.html#cb51-3" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">10</span> <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;0-10&quot;</span>,</span>
-<span id="cb51-4"><a href="person-deprecated.html#cb51-4" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">10</span> <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">20</span> <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;10-20&quot;</span>,</span>
-<span id="cb51-5"><a href="person-deprecated.html#cb51-5" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">20</span> <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">30</span> <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;20-30&quot;</span>,</span>
-<span id="cb51-6"><a href="person-deprecated.html#cb51-6" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">30</span> <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">40</span> <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;30-40&quot;</span>,</span>
-<span id="cb51-7"><a href="person-deprecated.html#cb51-7" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">40</span> <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">50</span> <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;40-50&quot;</span>,</span>
-<span id="cb51-8"><a href="person-deprecated.html#cb51-8" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">50</span> <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">60</span> <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;50-60&quot;</span>,</span>
-<span id="cb51-9"><a href="person-deprecated.html#cb51-9" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">60</span> <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">70</span> <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;60-70&quot;</span>,</span>
-<span id="cb51-10"><a href="person-deprecated.html#cb51-10" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">70</span> <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">80</span> <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;70-80&quot;</span>,</span>
-<span id="cb51-11"><a href="person-deprecated.html#cb51-11" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">80</span> <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">90</span> <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;80-90&quot;</span>,</span>
-<span id="cb51-12"><a href="person-deprecated.html#cb51-12" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">90</span> <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;90+&quot;</span></span>
-<span id="cb51-13"><a href="person-deprecated.html#cb51-13" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb51-14"><a href="person-deprecated.html#cb51-14" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb51-15"><a href="person-deprecated.html#cb51-15" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.concept <span class="kw">ON</span> <span class="fu">CAST</span>(stratum_1 <span class="kw">AS</span> BIGINT) <span class="op">=</span> concept_id</span>
-<span id="cb51-16"><a href="person-deprecated.html#cb51-16" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">102</span></span>
-<span id="cb51-17"><a href="person-deprecated.html#cb51-17" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span> name, acronym</span></code></pre></div>
+<div class="sourceCode" id="cb50"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb50-1"><a href="person-deprecated.html#cb50-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb50-2"><a href="person-deprecated.html#cb50-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
+<span id="cb50-3"><a href="person-deprecated.html#cb50-3" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">10</span></span>
+<span id="cb50-4"><a href="person-deprecated.html#cb50-4" aria-hidden="true"></a>         <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;0-10&quot;</span>,</span>
+<span id="cb50-5"><a href="person-deprecated.html#cb50-5" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">10</span></span>
+<span id="cb50-6"><a href="person-deprecated.html#cb50-6" aria-hidden="true"></a>         <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">20</span></span>
+<span id="cb50-7"><a href="person-deprecated.html#cb50-7" aria-hidden="true"></a>         <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;10-20&quot;</span>,</span>
+<span id="cb50-8"><a href="person-deprecated.html#cb50-8" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">20</span></span>
+<span id="cb50-9"><a href="person-deprecated.html#cb50-9" aria-hidden="true"></a>         <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">30</span></span>
+<span id="cb50-10"><a href="person-deprecated.html#cb50-10" aria-hidden="true"></a>         <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;20-30&quot;</span>,</span>
+<span id="cb50-11"><a href="person-deprecated.html#cb50-11" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">30</span></span>
+<span id="cb50-12"><a href="person-deprecated.html#cb50-12" aria-hidden="true"></a>         <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">40</span></span>
+<span id="cb50-13"><a href="person-deprecated.html#cb50-13" aria-hidden="true"></a>         <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;30-40&quot;</span>,</span>
+<span id="cb50-14"><a href="person-deprecated.html#cb50-14" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">40</span></span>
+<span id="cb50-15"><a href="person-deprecated.html#cb50-15" aria-hidden="true"></a>         <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">50</span></span>
+<span id="cb50-16"><a href="person-deprecated.html#cb50-16" aria-hidden="true"></a>         <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;40-50&quot;</span>,</span>
+<span id="cb50-17"><a href="person-deprecated.html#cb50-17" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">50</span></span>
+<span id="cb50-18"><a href="person-deprecated.html#cb50-18" aria-hidden="true"></a>         <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">60</span></span>
+<span id="cb50-19"><a href="person-deprecated.html#cb50-19" aria-hidden="true"></a>         <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;50-60&quot;</span>,</span>
+<span id="cb50-20"><a href="person-deprecated.html#cb50-20" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">60</span></span>
+<span id="cb50-21"><a href="person-deprecated.html#cb50-21" aria-hidden="true"></a>         <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">70</span></span>
+<span id="cb50-22"><a href="person-deprecated.html#cb50-22" aria-hidden="true"></a>         <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;60-70&quot;</span>,</span>
+<span id="cb50-23"><a href="person-deprecated.html#cb50-23" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">70</span></span>
+<span id="cb50-24"><a href="person-deprecated.html#cb50-24" aria-hidden="true"></a>         <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">80</span></span>
+<span id="cb50-25"><a href="person-deprecated.html#cb50-25" aria-hidden="true"></a>         <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;70-80&quot;</span>,</span>
+<span id="cb50-26"><a href="person-deprecated.html#cb50-26" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">80</span></span>
+<span id="cb50-27"><a href="person-deprecated.html#cb50-27" aria-hidden="true"></a>         <span class="kw">AND</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&lt;</span> <span class="dv">90</span></span>
+<span id="cb50-28"><a href="person-deprecated.html#cb50-28" aria-hidden="true"></a>         <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;80-90&quot;</span>,</span>
+<span id="cb50-29"><a href="person-deprecated.html#cb50-29" aria-hidden="true"></a>       <span class="fu">SUM</span>(<span class="cf">CASE</span> <span class="cf">WHEN</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> <span class="dt">INTEGER</span>) <span class="op">&gt;=</span> <span class="dv">90</span></span>
+<span id="cb50-30"><a href="person-deprecated.html#cb50-30" aria-hidden="true"></a>         <span class="cf">THEN</span> count_value <span class="cf">END</span>) <span class="kw">AS</span> <span class="ot">&quot;90+&quot;</span></span>
+<span id="cb50-31"><a href="person-deprecated.html#cb50-31" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb50-32"><a href="person-deprecated.html#cb50-32" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb50-33"><a href="person-deprecated.html#cb50-33" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb50-34"><a href="person-deprecated.html#cb50-34" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.concept</span>
+<span id="cb50-35"><a href="person-deprecated.html#cb50-35" aria-hidden="true"></a>  <span class="kw">ON</span> <span class="fu">CAST</span>(stratum_1 <span class="kw">AS</span> BIGINT) <span class="op">=</span> concept_id</span>
+<span id="cb50-36"><a href="person-deprecated.html#cb50-36" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">102</span></span>
+<span id="cb50-37"><a href="person-deprecated.html#cb50-37" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span> name, acronym</span></code></pre></div>
 </div>
 <div id="chart-settings-8" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -449,13 +469,14 @@ <h3>Age at first observation - Bars {#age1ObservationBars}</h3>
 </div>
 <div id="sql-query-8" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb52"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb52-1"><a href="person-deprecated.html#cb52-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb52-2"><a href="person-deprecated.html#cb52-2" aria-hidden="true"></a>    <span class="fu">cast</span>(stratum_1 <span class="kw">AS</span> <span class="dt">int</span>) <span class="kw">AS</span> Age,</span>
-<span id="cb52-3"><a href="person-deprecated.html#cb52-3" aria-hidden="true"></a>    count_value <span class="kw">AS</span> <span class="fu">count</span>, </span>
-<span id="cb52-4"><a href="person-deprecated.html#cb52-4" aria-hidden="true"></a>    <span class="kw">source</span>.acronym</span>
-<span id="cb52-5"><a href="person-deprecated.html#cb52-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb52-6"><a href="person-deprecated.html#cb52-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb52-7"><a href="person-deprecated.html#cb52-7" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">101</span></span></code></pre></div>
+<div class="sourceCode" id="cb51"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb51-1"><a href="person-deprecated.html#cb51-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb51-2"><a href="person-deprecated.html#cb51-2" aria-hidden="true"></a>    <span class="fu">cast</span>(stratum_1 <span class="kw">AS</span> <span class="dt">int</span>) <span class="kw">AS</span> Age,</span>
+<span id="cb51-3"><a href="person-deprecated.html#cb51-3" aria-hidden="true"></a>    count_value <span class="kw">AS</span> <span class="fu">count</span>, </span>
+<span id="cb51-4"><a href="person-deprecated.html#cb51-4" aria-hidden="true"></a>    <span class="kw">source</span>.acronym</span>
+<span id="cb51-5"><a href="person-deprecated.html#cb51-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb51-6"><a href="person-deprecated.html#cb51-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb51-7"><a href="person-deprecated.html#cb51-7" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb51-8"><a href="person-deprecated.html#cb51-8" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">101</span></span></code></pre></div>
 </div>
 <div id="chart-settings-9" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -504,13 +525,14 @@ <h3>Year of Birth {#yearOfBirth}</h3>
 </div>
 <div id="sql-query-9" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb53"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb53-1"><a href="person-deprecated.html#cb53-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb53-2"><a href="person-deprecated.html#cb53-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
-<span id="cb53-3"><a href="person-deprecated.html#cb53-3" aria-hidden="true"></a>       stratum_1 <span class="kw">AS</span> <span class="ot">&quot;Birth_year&quot;</span>,</span>
-<span id="cb53-4"><a href="person-deprecated.html#cb53-4" aria-hidden="true"></a>       count_value <span class="kw">AS</span> <span class="fu">count</span></span>
-<span id="cb53-5"><a href="person-deprecated.html#cb53-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb53-6"><a href="person-deprecated.html#cb53-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb53-7"><a href="person-deprecated.html#cb53-7" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">3</span></span></code></pre></div>
+<div class="sourceCode" id="cb52"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb52-1"><a href="person-deprecated.html#cb52-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb52-2"><a href="person-deprecated.html#cb52-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
+<span id="cb52-3"><a href="person-deprecated.html#cb52-3" aria-hidden="true"></a>       stratum_1 <span class="kw">AS</span> <span class="ot">&quot;Birth_year&quot;</span>,</span>
+<span id="cb52-4"><a href="person-deprecated.html#cb52-4" aria-hidden="true"></a>       count_value <span class="kw">AS</span> <span class="fu">count</span></span>
+<span id="cb52-5"><a href="person-deprecated.html#cb52-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb52-6"><a href="person-deprecated.html#cb52-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb52-7"><a href="person-deprecated.html#cb52-7" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb52-8"><a href="person-deprecated.html#cb52-8" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">3</span></span></code></pre></div>
 </div>
 <div id="chart-settings-10" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -560,18 +582,19 @@ <h3>Gender</h3>
 </div>
 <div id="sql-query-10" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb54"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb54-1"><a href="person-deprecated.html#cb54-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb54-2"><a href="person-deprecated.html#cb54-2" aria-hidden="true"></a>       concept_name <span class="kw">AS</span> Gender, </span>
-<span id="cb54-3"><a href="person-deprecated.html#cb54-3" aria-hidden="true"></a>       count_value <span class="kw">AS</span> Number_of_persons,</span>
-<span id="cb54-4"><a href="person-deprecated.html#cb54-4" aria-hidden="true"></a>       <span class="kw">source</span>.acronym</span>
-<span id="cb54-5"><a href="person-deprecated.html#cb54-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb54-6"><a href="person-deprecated.html#cb54-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb54-7"><a href="person-deprecated.html#cb54-7" aria-hidden="true"></a><span class="kw">JOIN</span> (</span>
-<span id="cb54-8"><a href="person-deprecated.html#cb54-8" aria-hidden="true"></a>  <span class="kw">SELECT</span> <span class="st">&#39;8507&#39;</span> <span class="kw">AS</span> concept_id, <span class="st">&#39;Male&#39;</span> <span class="kw">AS</span> concept_name</span>
-<span id="cb54-9"><a href="person-deprecated.html#cb54-9" aria-hidden="true"></a>  <span class="kw">UNION</span></span>
-<span id="cb54-10"><a href="person-deprecated.html#cb54-10" aria-hidden="true"></a>  <span class="kw">SELECT</span> <span class="st">&#39;8532&#39;</span> <span class="kw">AS</span> concept_id, <span class="st">&#39;Female&#39;</span> <span class="kw">AS</span> concept_name</span>
-<span id="cb54-11"><a href="person-deprecated.html#cb54-11" aria-hidden="true"></a>) <span class="kw">AS</span> concepts <span class="kw">ON</span> achilles.stratum_1 <span class="op">=</span> concept_id</span>
-<span id="cb54-12"><a href="person-deprecated.html#cb54-12" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">2</span></span></code></pre></div>
+<div class="sourceCode" id="cb53"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb53-1"><a href="person-deprecated.html#cb53-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb53-2"><a href="person-deprecated.html#cb53-2" aria-hidden="true"></a>       concept_name <span class="kw">AS</span> Gender, </span>
+<span id="cb53-3"><a href="person-deprecated.html#cb53-3" aria-hidden="true"></a>       count_value <span class="kw">AS</span> Number_of_persons,</span>
+<span id="cb53-4"><a href="person-deprecated.html#cb53-4" aria-hidden="true"></a>       <span class="kw">source</span>.acronym</span>
+<span id="cb53-5"><a href="person-deprecated.html#cb53-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb53-6"><a href="person-deprecated.html#cb53-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb53-7"><a href="person-deprecated.html#cb53-7" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb53-8"><a href="person-deprecated.html#cb53-8" aria-hidden="true"></a><span class="kw">JOIN</span> (</span>
+<span id="cb53-9"><a href="person-deprecated.html#cb53-9" aria-hidden="true"></a>  <span class="kw">SELECT</span> <span class="st">&#39;8507&#39;</span> <span class="kw">AS</span> concept_id, <span class="st">&#39;Male&#39;</span> <span class="kw">AS</span> concept_name</span>
+<span id="cb53-10"><a href="person-deprecated.html#cb53-10" aria-hidden="true"></a>  <span class="kw">UNION</span></span>
+<span id="cb53-11"><a href="person-deprecated.html#cb53-11" aria-hidden="true"></a>  <span class="kw">SELECT</span> <span class="st">&#39;8532&#39;</span> <span class="kw">AS</span> concept_id, <span class="st">&#39;Female&#39;</span> <span class="kw">AS</span> concept_name</span>
+<span id="cb53-12"><a href="person-deprecated.html#cb53-12" aria-hidden="true"></a>) <span class="kw">AS</span> concepts <span class="kw">ON</span> achilles.stratum_1 <span class="op">=</span> concept_id</span>
+<span id="cb53-13"><a href="person-deprecated.html#cb53-13" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">2</span></span></code></pre></div>
 </div>
 <div id="chart-settings-11" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
diff --git a/docs/processes.html b/docs/processes.html
index 9ba4a904..e9b5db8c 100644
--- a/docs/processes.html
+++ b/docs/processes.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -495,8 +495,8 @@ <h3>Catalogue Results Files</h3>
 <table>
 <thead>
 <tr class="header">
-<th>Analysis Id</th>
-<th>Stratum 1</th>
+<th align="right">Analysis Id</th>
+<th align="left">Stratum 1</th>
 <th>Stratum 2</th>
 <th>Stratum 3</th>
 <th>Stratum 4</th>
@@ -505,16 +505,16 @@ <h3>Catalogue Results Files</h3>
 </thead>
 <tbody>
 <tr class="odd">
-<td>0</td>
-<td></td>
+<td align="right">0</td>
+<td align="left"></td>
 <td>R Package Version</td>
 <td>Generation Date</td>
 <td></td>
 <td></td>
 </tr>
 <tr class="even">
-<td>5000</td>
-<td></td>
+<td align="right">5000</td>
+<td align="left"></td>
 <td>Source Release Date</td>
 <td>CDM Release Date</td>
 <td>CDM Version</td>
diff --git a/docs/processes.md b/docs/processes.md
index b2667c20..415ee269 100644
--- a/docs/processes.md
+++ b/docs/processes.md
@@ -113,8 +113,9 @@ While parsing the uploaded file, some data is extracted to then present on the U
 
 The next table is presented where the previous data is stored on the rows with analysis id 0 and 5000:
 
+
 | Analysis Id | Stratum 1 | Stratum 2           | Stratum 3        | Stratum 4   | Stratum 5          |
-| ----------- | --------- | ------------------- | ---------------- | ----------- | ------------------ |
+| -----------:|:--------- | ------------------- | ---------------- | ----------- | ------------------ |
 | 0           |           | R Package Version   | Generation Date  |             |                    |
 | 5000        |           | Source Release Date | CDM Release Date | CDM Version | Vocabulary Version |
 
diff --git a/docs/provenance-deprecated.html b/docs/provenance-deprecated.html
index 9ff1c8f6..075f8a0c 100644
--- a/docs/provenance-deprecated.html
+++ b/docs/provenance-deprecated.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -329,9 +329,9 @@ <h2><span class="header-section-number">9.10</span> Provenance [Deprecated]</h2>
 <div id="css-8" class="section level3 unnumbered" number="">
 <h3>CSS</h3>
 <p>To hide the dashboard header insert the following css code to the <code>CSS</code> field on the edit page:</p>
-<div class="sourceCode" id="cb68"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb68-1"><a href="provenance-deprecated.html#cb68-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
-<span id="cb68-2"><a href="provenance-deprecated.html#cb68-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb68-3"><a href="provenance-deprecated.html#cb68-3" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb67"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb67-1"><a href="provenance-deprecated.html#cb67-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
+<span id="cb67-2"><a href="provenance-deprecated.html#cb67-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb67-3"><a href="provenance-deprecated.html#cb67-3" aria-hidden="true"></a>}</span></code></pre></div>
 <p>With this every time you want to edit the dashboard layout you have to either comment the CSS inserted
 or remove it so the “Edit Dashboard” button can show again.</p>
 </div>
@@ -385,29 +385,37 @@ <h3>Condition &amp; Drug &amp; Procedure &amp; Device &amp; Measurement &amp; Ob
 <div id="sql-query-24" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
 <p>All 6 charts use the same sql query.</p>
-<div class="sourceCode" id="cb69"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb69-1"><a href="provenance-deprecated.html#cb69-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb69-2"><a href="provenance-deprecated.html#cb69-2" aria-hidden="true"></a>    <span class="kw">source</span>.acronym,</span>
-<span id="cb69-3"><a href="provenance-deprecated.html#cb69-3" aria-hidden="true"></a>    <span class="cf">CASE</span> <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">405</span> <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span></span>
-<span id="cb69-4"><a href="provenance-deprecated.html#cb69-4" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">605</span> <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span></span>
-<span id="cb69-5"><a href="provenance-deprecated.html#cb69-5" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">705</span> <span class="cf">THEN</span> <span class="st">&#39;Drug&#39;</span></span>
-<span id="cb69-6"><a href="provenance-deprecated.html#cb69-6" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">805</span> <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span></span>
-<span id="cb69-7"><a href="provenance-deprecated.html#cb69-7" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">1805</span> <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span></span>
-<span id="cb69-8"><a href="provenance-deprecated.html#cb69-8" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">2105</span> <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span></span>
-<span id="cb69-9"><a href="provenance-deprecated.html#cb69-9" aria-hidden="true"></a>    <span class="cf">ELSE</span> <span class="st">&#39;Other&#39;</span> <span class="cf">END</span> <span class="kw">AS</span> domain_name,</span>
-<span id="cb69-10"><a href="provenance-deprecated.html#cb69-10" aria-hidden="true"></a>    concept_name,</span>
-<span id="cb69-11"><a href="provenance-deprecated.html#cb69-11" aria-hidden="true"></a>    <span class="fu">SUM</span>(count_value) <span class="kw">AS</span> num_records</span>
-<span id="cb69-12"><a href="provenance-deprecated.html#cb69-12" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb69-13"><a href="provenance-deprecated.html#cb69-13" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb69-14"><a href="provenance-deprecated.html#cb69-14" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.concept <span class="kw">AS</span> c1 <span class="kw">ON</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> BIGINT) <span class="op">=</span> concept_id</span>
-<span id="cb69-15"><a href="provenance-deprecated.html#cb69-15" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="kw">IN</span> (<span class="dv">405</span>,<span class="dv">605</span>,<span class="dv">705</span>,<span class="dv">805</span>,<span class="dv">1805</span>,<span class="dv">2105</span>)</span>
-<span id="cb69-16"><a href="provenance-deprecated.html#cb69-16" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span> <span class="kw">source</span>.name, <span class="kw">source</span>.acronym, concept_name, </span>
-<span id="cb69-17"><a href="provenance-deprecated.html#cb69-17" aria-hidden="true"></a>    <span class="cf">CASE</span> <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">405</span> <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span></span>
-<span id="cb69-18"><a href="provenance-deprecated.html#cb69-18" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">605</span> <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span></span>
-<span id="cb69-19"><a href="provenance-deprecated.html#cb69-19" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">705</span> <span class="cf">THEN</span> <span class="st">&#39;Drug&#39;</span></span>
-<span id="cb69-20"><a href="provenance-deprecated.html#cb69-20" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">805</span> <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span></span>
-<span id="cb69-21"><a href="provenance-deprecated.html#cb69-21" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">1805</span> <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span></span>
-<span id="cb69-22"><a href="provenance-deprecated.html#cb69-22" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">2105</span> <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span></span>
-<span id="cb69-23"><a href="provenance-deprecated.html#cb69-23" aria-hidden="true"></a>    <span class="cf">ELSE</span> <span class="st">&#39;Other&#39;</span> <span class="cf">END</span></span></code></pre></div>
+<div class="sourceCode" id="cb68"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb68-1"><a href="provenance-deprecated.html#cb68-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb68-2"><a href="provenance-deprecated.html#cb68-2" aria-hidden="true"></a>    <span class="kw">source</span>.acronym,</span>
+<span id="cb68-3"><a href="provenance-deprecated.html#cb68-3" aria-hidden="true"></a>    <span class="cf">CASE</span> <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">405</span></span>
+<span id="cb68-4"><a href="provenance-deprecated.html#cb68-4" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span></span>
+<span id="cb68-5"><a href="provenance-deprecated.html#cb68-5" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">605</span></span>
+<span id="cb68-6"><a href="provenance-deprecated.html#cb68-6" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span></span>
+<span id="cb68-7"><a href="provenance-deprecated.html#cb68-7" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">705</span></span>
+<span id="cb68-8"><a href="provenance-deprecated.html#cb68-8" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Drug&#39;</span></span>
+<span id="cb68-9"><a href="provenance-deprecated.html#cb68-9" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">805</span></span>
+<span id="cb68-10"><a href="provenance-deprecated.html#cb68-10" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span></span>
+<span id="cb68-11"><a href="provenance-deprecated.html#cb68-11" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">1805</span></span>
+<span id="cb68-12"><a href="provenance-deprecated.html#cb68-12" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span></span>
+<span id="cb68-13"><a href="provenance-deprecated.html#cb68-13" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">2105</span></span>
+<span id="cb68-14"><a href="provenance-deprecated.html#cb68-14" aria-hidden="true"></a>      <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span></span>
+<span id="cb68-15"><a href="provenance-deprecated.html#cb68-15" aria-hidden="true"></a>    <span class="cf">ELSE</span> <span class="st">&#39;Other&#39;</span> <span class="cf">END</span> <span class="kw">AS</span> domain_name,</span>
+<span id="cb68-16"><a href="provenance-deprecated.html#cb68-16" aria-hidden="true"></a>    concept_name,</span>
+<span id="cb68-17"><a href="provenance-deprecated.html#cb68-17" aria-hidden="true"></a>    <span class="fu">SUM</span>(count_value) <span class="kw">AS</span> num_records</span>
+<span id="cb68-18"><a href="provenance-deprecated.html#cb68-18" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb68-19"><a href="provenance-deprecated.html#cb68-19" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb68-20"><a href="provenance-deprecated.html#cb68-20" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb68-21"><a href="provenance-deprecated.html#cb68-21" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.concept <span class="kw">AS</span> c1</span>
+<span id="cb68-22"><a href="provenance-deprecated.html#cb68-22" aria-hidden="true"></a>  <span class="kw">ON</span> <span class="fu">CAST</span>(stratum_2 <span class="kw">AS</span> BIGINT) <span class="op">=</span> concept_id</span>
+<span id="cb68-23"><a href="provenance-deprecated.html#cb68-23" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="kw">IN</span> (<span class="dv">405</span>,<span class="dv">605</span>,<span class="dv">705</span>,<span class="dv">805</span>,<span class="dv">1805</span>,<span class="dv">2105</span>)</span>
+<span id="cb68-24"><a href="provenance-deprecated.html#cb68-24" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span> <span class="kw">source</span>.name, <span class="kw">source</span>.acronym, concept_name, </span>
+<span id="cb68-25"><a href="provenance-deprecated.html#cb68-25" aria-hidden="true"></a>    <span class="cf">CASE</span> <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">405</span> <span class="cf">THEN</span> <span class="st">&#39;Condition&#39;</span></span>
+<span id="cb68-26"><a href="provenance-deprecated.html#cb68-26" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">605</span> <span class="cf">THEN</span> <span class="st">&#39;Procedure&#39;</span></span>
+<span id="cb68-27"><a href="provenance-deprecated.html#cb68-27" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">705</span> <span class="cf">THEN</span> <span class="st">&#39;Drug&#39;</span></span>
+<span id="cb68-28"><a href="provenance-deprecated.html#cb68-28" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">805</span> <span class="cf">THEN</span> <span class="st">&#39;Observation&#39;</span></span>
+<span id="cb68-29"><a href="provenance-deprecated.html#cb68-29" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">1805</span> <span class="cf">THEN</span> <span class="st">&#39;Measurement&#39;</span></span>
+<span id="cb68-30"><a href="provenance-deprecated.html#cb68-30" aria-hidden="true"></a>    <span class="cf">WHEN</span> analysis_id <span class="op">=</span> <span class="dv">2105</span> <span class="cf">THEN</span> <span class="st">&#39;Device&#39;</span></span>
+<span id="cb68-31"><a href="provenance-deprecated.html#cb68-31" aria-hidden="true"></a>    <span class="cf">ELSE</span> <span class="st">&#39;Other&#39;</span> <span class="cf">END</span></span></code></pre></div>
 </div>
 <div id="chart-settings-26" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
diff --git a/docs/reference-keys.txt b/docs/reference-keys.txt
index d71da36d..f0bb5604 100644
--- a/docs/reference-keys.txt
+++ b/docs/reference-keys.txt
@@ -28,8 +28,6 @@ introduction
 installation
 processes
 backups
-restore
-useful-stuff
 customizations
 development-instructions
 code-documentation
diff --git a/docs/restore.html b/docs/restore.html
index aa965c59..f99cd384 100644
--- a/docs/restore.html
+++ b/docs/restore.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-04-29" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -326,39 +326,10 @@ <h1>
 <div id="restore" class="section level2" number="5.1">
 <h2><span class="header-section-number">5.1</span> Restore</h2>
 <ol style="list-style-type: decimal">
-<li><p>Select the compressed backup you want to restore and decompress it:</p>
-<p><code>tar -xJf BACKUP_FILE.tar.xz</code>.</p></li>
-<li><ol style="list-style-type: decimal">
-<li><p><strong>Redis</strong></p>
-<ol style="list-style-type: decimal">
-<li><p>Make sure the redis docker container is down.</p></li>
-<li><p>(Re)place the file <code>dump.rdb</code> on the redis volume by the file <code>redis.rdb</code>. By default the redis volume is located where this repository was cloned on the directory <code>docker/volumes/redis</code>.</p></li>
-<li><p>Change its permissions, owner and group:</p>
-<pre class="shell"><code>chmod 0644 docker/volumes/redis/dump.rdb
-sudo chown -R 999:999 docker/volumes/redis</code></pre></li>
-</ol></li>
-<li><p><strong>Postgres</strong></p>
-<ol style="list-style-type: decimal">
-<li><p>Make sure all containers that make changes on the database are stopped.</p></li>
-<li><p>Copy the file <code>postgres_backup.sql</code> into the postgres container</p>
-<p><code>docker cp postgres.sql [CONTAINER_ID]:/tmp</code>.</p></li>
-<li><p>Execute the backup script:</p>
-<p><code>docker exec -u root dashboard_viewer_postgres_1 psql -f /tmp/postgres_backup.sql -U \$POSTGRES_USER -d \$POSTGRES_DB</code>.</p></li>
-</ol></li>
-<li><p><strong>Media Files</strong> If you have a volume pointing to where the media files are stored, replace all files with the ones present on the downloaded backup file. Else:</p>
-<ol style="list-style-type: decimal">
-<li><p>Bring the dashoard container up <code>docker-compose up -d dashboard</code></p></li>
-<li><p>Enter in the container <code>docker exec -it [CONTAINER_ID] bash</code></p></li>
-<li><p>If you don’t know where the media files are stored you can check the value of the MEDIA_ROOT variable</p>
-<ol style="list-style-type: decimal">
-<li><p><code>python manage.py shell</code></p></li>
-<li><p><code>from django.conf import settings</code></p></li>
-<li><p><code>print(settings.MEDIA_ROOT)</code></p></li>
-</ol></li>
-<li><p>Remove the entire MEDIA_ROOT directory and exit the container</p></li>
-<li><p>Copy the media directory present on the backup file to the catalogue container <code>docker cp -a collected-media [CONTAINER_ID]:[MEDIA_ROOT_PARENT_PATH]</code></p></li>
-</ol></li>
-</ol></li>
+<li><p>Select the compressed backup you want to restore.</p></li>
+<li><p>Make sure that all the environment variables are the same as the ones that were used for the chosen backup file.
+Additionally, the <code>.dashboards_backups.conf</code> file is also necessary to set up, since the <code>TMP_DIRECTORY</code> variable will be used.</p></li>
+<li><p>Run the <code>backups/restore.sh</code> script.</p></li>
 </ol>
 </div>
             </section>
diff --git a/docs/search_index.json b/docs/search_index.json
index ced15d4f..719c4f4a 100644
--- a/docs/search_index.json
+++ b/docs/search_index.json
@@ -1 +1 @@
-[["index.html", "Data Network Dashboards Chapter 1 Preface", " Data Network Dashboards This document is currently under construction 2022-01-04 Chapter 1 Preface Automated Characterization of Health Information at Large-scale Longitudinal Evidence Systems (ACHILLES) is a profiling tool developed by the OHDSI community to provide descriptive statistics of databases standardized to the OMOP Common Data Model. These characteristics are presented graphically in the ATLAS tool. However, this solution does not allow for database comparison across the data network. The Data Network Dashboards aggregates ACHILLES results files from databases in the network and displays the descriptive statistics through graphical dashboards. This tool is helpful to gain insight in the growth of the data network and is useful for the selection of databases for specific research questions. In the software demonstration we show a first version of this tool that will be further developed in EHDEN in close collaboration with all our stakeholders, including OHDSI. Contributors To develop this tool, EHDEN organized a hack-a-thon (Aveiro, December 2-3, 2019), where we defined and implemented a series of charts and dashboards containing the most relevant information about the OMOP CDM databases. The team involved in this task were composed by the following members: Joo Rafael Almeida1 Andr Pedrosa1 Peter R. Rijnbeek2 Marcel de Wilde2 Michel Van Speybroeck3 Maxim Moinat4 Pedro Freire1 Alina Trifan1 Srgio Matos1 Jos Lus Oliveira1 1 - Institute of Electronics and Informatics Engineering of Aveiro, Department of Electronics and Telecommunication, University of Aveiro, Aveiro, Portugal 2 - Erasmus MC, Rotterdam, Netherlands 3 - Janssen Pharmaceutica NV, Beerse, Belgium 4 - The Hyve, Utrecht, Netherlands Considerations This manual was written to be a guide for a clean installation of this system with all the dashboards that we defined during the project. The first chapter describes the goal of the system and the second how to install the system. The remaining chapters are dedicated to the dashboards, in which chapters describes one dashboard and all its charts. To simplify the representation of the dashboards layout, we used similar schemas as it is presented in Figure 1.1. The white box is the dashboard and the inside boxes are charts. The colour changes in relation to the type of chart. Figure 1.1: Example of a dashboards tool presenting the databases available in the network (simulated data) License The system is open-source and this manual was written in RMarkdown using the bookdown package. Acknowledges This work has been conducted in the context of EHDEN, a project that receives funding from the European Unions Horizon 2020 and EFPIA through IMI2 Joint Undertaking initiative, under grant agreement No 806968. "],["introduction.html", "Chapter 2 Introduction", " Chapter 2 Introduction The OHDSI research network has been growing steadily which results in an increasing number of healthcare databases standardized to the OMOP CDM format. The OHDSI community created the ACHILLES tool (Automated Characterization of Health Information at Large-scale Longitudinal Exploration System) to characterize those databases. The results are available to the data custodian in their local ATLAS tool and helps them to gain insights in their data and helps in assessing the feasibility of a particular research questions. ACHILLES was designed to extract the metadata from a single database, which by itself does not allow the comparison with the remaining databases in the network. However, we believe there is even more value in sharing this information with others to enable network research in a Data Network Dashboard. Data Network Dashboard The European Health Data and Evidence Network (EHDEN) project therefore designed a Data Network Dashboard tool, a web application to aggregate information from distributed OMOP CDM databases. It uses the ACHILLES results files to construct graphical dashboards and enables database comparison (Figure 2.1). The tool is built on Apache Superset, which is an open-source enterprise-ready business intelligence web application that can provide powerful and fully customizable graphical representations of data. Achilles results can be uploaded through the EHDEN Database Catalogue using the dashboards plugin but can also be directly uploaded in the tool. Figure 1. Example of a dashboards tool presenting age and gender distributions (simulated data). Figure 2.1: Example of a dashboards tool presenting the databases available in the network (simulated data) In this tools, we defined and implemented a series of charts and dashboards containing the most relevant information about the databases, such as: General: dashboards that shows the databases types per country, the distribution of data source types, the growth of the Network including the number of database and the number of patients in the databases over time; Person: representing the number of patients per country, age distribution at first observation, year of birth distribution and normalized gender distribution; Population characteristics: dashboard with the cumulative patient time, persons with continuous observation per month, and the start and end dates of those periods; Visit: chart to compare the number and type of visit occurrence records; Death: information about the number of death records by month, and the patient age at time of death; Concepts: bubble chart which shows the number of patients and records per concept over the databases; Data domains: heat map visualization of the major data domains in each database. "],["installation.html", "Chapter 3 Installation", " Chapter 3 Installation Currently, we use docker to deploy our environment First Steps Clone the repository with the command git clone --recurse-submodules https://github.com/EHDEN/NetworkDashboards. If you already cloned the repository without the --recurse-submodules option, run git submodule update --init to fetch the superset submodule. Create a .env file on the docker directory, using .env-example as a reference, setting all necessary environment variables (SUPERSET\\_MAPBOX\\_API\\_KEY and DASHBOARD\\_VIEWER\\_SECRET\\_KEY). 2.1 If you will use this application as a third-party application and will iframe it, set the variable SINGLE\\_APPLICATION\\_MODE to False and define the host of the main application on the variable MAIN\\_APPLICATION\\_HOST. Also make sure to add this last host to the list of ALLOWED\\_HOSTS. Dashboard Viewer setup If you wish to expose the dashboard viewer app through a specific domain(s) you must add it/them to the ALLOWED_HOSTS list on file dashboard_viewer/dashboard_viewer/settings.py and remove the '*' entry. Build containers images: docker-compose build. This might take several minutes. Set up the database and create an admin account for the dashboard viewer app: docker-compose run --rm dashboard ./docker-init.sh. Insert Concepts The concepts table is not in the repository due to its dimension, therefore we use directly the Postgres console to insert this table in the installation. Get your concept csv file from Athena Copy the file into postgres container docker cp concept.csv dashboard_viewer_postgres_1:/tmp/ Enter in the postgres container: docker exec -it dashboard_viewer_postgres_1 bash Enter in the achilles database (value of the variable POSTGRES_ACHILLES_DB on the .env file) with the root user (value of the variable POSTGRES_ROOT_USER on the .env file): psql achilles root Create the concept table CREATE TABLE concept ( concept_id INTEGER NOT NULL, concept_name VARCHAR(255) NOT NULL, domain_id VARCHAR(20) NOT NULL, vocabulary_id VARCHAR(20) NOT NULL, concept_class_id VARCHAR(20) NOT NULL, standard_concept VARCHAR(1) NULL, concept_code VARCHAR(50) NOT NULL, valid_start_date DATE NOT NULL, valid_end_date DATE NOT NULL, invalid_reason VARCHAR(1) NULL ); Copy the CSV file content to the table (this could take a while) To get both ' (single quotes) and \" (double quotes) on the concept_name column we use a workaround by setting the quote character to one that should never be in the text. Here we used \\b (backslash). COPY public.concept FROM &#39;/tmp/concept.csv&#39; WITH CSV HEADER DELIMITER E&#39;\\t&#39; QUOTE E&#39;\\b&#39;; Create index in table (this could take a while): CREATE INDEX concept_concept_id_index ON concept (concept_id); CREATE INDEX concept_concept_name_index ON concept (concept_name); Set the owner of the concept table to the achilles user (value of the variable POSTGRES_ACHILLES_USER on the .env file): ALTER TABLE concept OWNER TO achiller Bring up the containers: docker-compose up -d. Run the command docker-compose run --rm dashboard python manage.py generate_materialized_views to create the materialized views on Postgres. Superset setup Bring up the containers: docker-compose up -d. Make sure that the container superset-init has finished before continuing. It is creating the necessary tables on the database and creating permissions and roles. If you used the default ports: Go to http://localhost to access the dashboard viewer app. Go to http://localhost:8088 to access superset. By default Supersets admin user credentials are admin/admin. It is recommended that you change the password if you will use this in a production environment. To any anonymous user view dashboards, add the following: all datasource access on all_datasource_access can csrf token on Superset can dashboard on Superset can explore json on Superset can read on Chart can read on CssTemplate can read on Dashboard Dummy data On a fresh installation, there are no achilles_results data so Supersets dashboards will display No results. On the root of this repository, you can find the demo directory where we have an ACHILLES results file with synthetic data that you can upload to a data source on the uploader app of the dashboard viewer (http://localhost/uploader). If you wish to compare multiple data sources, on the demo directory there is also a python script that allows you to generate new ACHILLES results files, where it generates random count values based on the ranges of values for each set of analysis_id and stratums present on a base ACHILLES results file. So, from the one ACHILLES results fill we provided, you can have multiple data sources with different data. "],["processes.html", "Chapter 4 Processes", " Chapter 4 Processes Data Sources Target: platform user Before uploading any data to this platform, a data source owner has to create a data source instance to then associated the upload data with. The creation of data source is done through the [BASE_URL]/uploader/ URL, where 7 fields are expected: name: an extensive name acronym: a short name country: where is the data source localized link (Optional): web page of the data source database type: type of OMOP database coordinates: a more accurate representation of the data sources localization hash (Optional): the internal unique identifier of a data source If you access [BASE_URL]/uploader/ the 7th field (hash) is set automatically for something random, however, if you want to set it use the [BASE_URL]/uploader/[HASH]/ URL. To avoid duplication on the database type field, this field is transformed (use title case and trimmed) and then is checked there is already a record (Database Type) with the same value. There are several ways to create a data source: Create through a web form By accessing the [BASE_URL]/uploader/ URL, you will get a form where you can field the fields, where the country field is a dropdown and the coordinates field is set through a map widget. Automatically create when performing a GET to the [BASE_URL]/uploader/ URL If the Network Dashboards platform is being used as a third-party application and the main application has all the data for the required fields, the data source can be automatically created and the user is redirected directly to the upload files page. To perform this, each field should be provided as a URL parameter when accessing the [BASE_URL]/uploader/ URL. If all required fields are provided and are valid the data source is created and the user is redirected to the upload files page. If a required field is missing or is not valid the webform is presented to the user so it can manually fill those fields. Automatically create by performing a POST to the [BASE_URL]/uploader/ URL Since the creation URL does not have csrf cookie protection, you can perform a POST request as you were submitting a form. Notes For the automatic options: Since the coordinates field is composed of two fields (latitude, longitude), it should be submitted as coordinates_0=[latitude] and coordinates_1=[longitude] The country field should match one of the available on the dropdown of the webform. Draft Status After a data owner uploads data into his data source, he might not want to make it public right away. To achieve this a data source has a boolean field telling whether if the data source is in draft mode. This then also allows creating dashboards with data of non-draft data sources only. There are three ways to change the value of this draft status field: Through the Django admin app ([BASE_URL]/admin/) Accessing the respective edit page of the data source. This requires a feature to be enabled, which is more detailed on the Allow Draft Status Updates section of the Customization chapter. Perform a PATCH request to the [BASE_URL]/uploader/[HASH]/ URL. On this request, other fields, other than the draft status, can be changed. The body of the request must be a JSON object with the fields that will suffer changes and their new values. Catalogue Results Files Target: platform user Once a data source is created you can access its upload page by accessing the [BASE_URL]/uploader/[HASH]/. If no data source has the provided hash you will be redirected back to the data source creation form. On the upload page you can: Go to the edit page of your data source Upload a catalogue results file Check the upload history A catalogue results file is a CSV file, the result obtained after running the EHDEN/CatalogueExport R package on an OMOP database. It is a variant of the OHDSI/Achilles where it only extracts a subset of analyses of the ACHILLES original set. The upload form expects a CSV file with the following columns: Name Type Required/Non-Nullable/Non-Empty analysis_id int Yes stratum_1 string No stratum_2 string No stratum_3 string No stratum_4 string No stratum_5 string No count_value int Yes min_value double No max_value double No avg_value double No stdev_value double No median_value double No p10_value double No p25_value double No p75_value double No p90_value double No The uploaded file must: either contain the first 7 columns OR all 16 columns contain the columns in the same order as presented in the table above While parsing the uploaded file, some data is extracted to then present on the Upload history and to update data source information. This data is extracted from the record with analysis id 0, which is required to be present on the file, and 5000, which is optional. Next is presented the data extracted and their description: R Package Version: the version of CatalogueExport R package used Generation Date: date at which the CatalogueExport was executed on the OMOP database Source Release Date: date at which the OMOP database was released CDM Release Date: date at which the used CDM version was released CDM Version: version of the CDM used Vocabulary Version: version of the vocabulary used The next table is presented where the previous data is stored on the rows with analysis id 0 and 5000: Analysis Id Stratum 1 Stratum 2 Stratum 3 Stratum 4 Stratum 5 0 R Package Version Generation Date 5000 Source Release Date CDM Release Date CDM Version Vocabulary Version Materialized Views Target: admin user For each chart, Superset has an underlying SQL query which in our case is run every time a chart is rendered. If one of these queries takes too long to execute the charts will also take too long until they are rendered and eventually users might get timeout messages given a bad user experience. To avoid this problem, instead of executing the raw SQL query we create a postgres materialized view of the query, which is then used to feed the data to the chart. So only a simple SELECT x FROM x query is executed when a chart is rendered. So whenever I create a chart I have to access the Postgres console? No, we created an unmanaged Materialized Queries model that maps to the materialized views on Postgres. With it you can create new materialized views through the Django admin app, by accessing the [BASE_URL]/admin/ URL. You have to provide the materialized view name and its query, which will then be used to execute the query CREATE MATERIALIZED VIEW [name] AS [query], which will be executed on a background task so the browser doesnt hang and times out, in case of complicated queries. Taking this into account, the record associated will not appear on the Django admin app until the CREATE MATERIALIZED VIEW query finishes. To give feedback on the background task we use celery/django-celery-results, so you can check the status of a task on the Task Results model of the Celery Results app After the creation of a Materialized Query, the will be a message telling the id of the task which is executing the CREATE MATERIALIZED VIEW query. You can then check for the record associated with the task, click on the id to get more details. If something went wrong check the error message either on Result Data or Traceback fields under the Result section After all this, the final step is to add the materialized view as a Dataset. Login into Superset, then go to Data -&gt; Datasets and create a new one. Select the Achilles database, the public schema, then the created materialized view and click ADD. After this, the materialized view can be used as a data source for a new chart. Tabs View [Deprecated] Note: This app is no longer maintaned and the associated urls were unlinked. Target: admin user Once there are data sources on the platform, data was uploaded to them and there are dashboards created on Superset, researchers can now browse through the dashboards and analyze and compare the data of the different data sources. One way to allow this would be to let them browse through the dashboard list on Superset. However, if there was some dashboards not ready to show to the public users, they could still access them. For that, it was created a page, with a sidebar, where public users could browse through the available and ready dashboards. It can be accessed through the URL [BASE_URL]/tabs/ The sidebar entries can be configured through the Django admin app, accessing the Tabsmanager app section. Here two models are available to create: Tab Groups: They allow to groups several sidebar entries within a collapsable group. Tabs: Will create a clickable entry on the sidebar that can be presented within a group. When a tab is clicked the associated dashboard will be displayed on the page. Each entry, tab, or group of them, expects: Title/Name Icon: Name of a font awesome version 5 icon Position: Allows to order entries along the sidebar. If a Tab has a group, then this field will order the tabs within that group only. Visible: If whether or not this tab or group should be visible. The goal of this field is to avoid having to delete the record from the database just because a certain tab is not ready and later on created it from scratch. Tabs additionally expect an URL, which will be used to display a Superset dashboard in an iframe. To hide Supersets menu bar, an additional standalone URL parameter should be appended to the provided URL of a tab. The value of the standalone arguments depends on the expected result: 1: menu bar is hidden. the bar where the dashboard title, publish status, and three dots option menu are present will still appear 2: both the menu bar and the dashboard title bar are hidden. By default, the dashboard of the first tab is displayed on the page, however, if one wants a specific tab to be displayed when the page is opened, its title should be present in the hash part of the URL. For example, if there is a tab called People, to make that tab selected at the start the following URL should be used [BASE_URL]/tabs/#People. "],["backups.html", "Chapter 5 Backups", " Chapter 5 Backups Create a credentials file (the structure of the file depends on the target cloud server) Create a .dashboards_backups.conf file under your home directory (variable $HOME) using dashboards_backups.conf.example as base, setting the appropriate value for the several variables. For variables associated with files and directories always use absolute paths. Variables: RUN: Set it to 0 if you dont want the next scheduled backup to run. This variable allows you to cancel any backup runs while you are doing some maintenance on the application. CONSTANCE_REDIS_DB: Number of the Redis database where the django constance config is stored. The default value is 2. This value should be the same as the environment variable REDIS_CONSTANCE_DB of the dashboard container. The following variables are associated with the arguemtns of the backup_uploader python package. Check its usage for more details: APP_NAME: The backup process will generate some directories with this name in places that are shared with other applications. SERVER: The name of the target cloud server to where backups should be uploaded (dropbox or mega). BACKUP_CHAIN_CONFIG: Allows having different directories with backups of different ages. CREDENTIALS_FILE_PATH: File containing the credentials to access the server to upload the backup file. Install the backup_uploader python package by following its install instructions. Schedule your backups * * * * * Command_to_execute | | | | | | | | | Day of the Week ( 0 - 6 ) ( Sunday = 0 ) | | | | | | | Month ( 1 - 12 ) | | | | | Day of Month ( 1 - 31 ) | | | Hour ( 0 - 23 ) | Min ( 0 - 59 ) (Retrived from: Tutorialspoint) Ex: To run every day at 3:00 am crontab -e Add entry 0 3 * * * $HOME/NetworkDashboards/backups/backup.sh (The path to the backup script might be different) "],["restore.html", "5.1 Restore", " 5.1 Restore Select the compressed backup you want to restore and decompress it: tar -xJf BACKUP_FILE.tar.xz. Redis Make sure the redis docker container is down. (Re)place the file dump.rdb on the redis volume by the file redis.rdb. By default the redis volume is located where this repository was cloned on the directory docker/volumes/redis. Change its permissions, owner and group: chmod 0644 docker/volumes/redis/dump.rdb sudo chown -R 999:999 docker/volumes/redis Postgres Make sure all containers that make changes on the database are stopped. Copy the file postgres_backup.sql into the postgres container docker cp postgres.sql [CONTAINER_ID]:/tmp. Execute the backup script: docker exec -u root dashboard_viewer_postgres_1 psql -f /tmp/postgres_backup.sql -U \\$POSTGRES_USER -d \\$POSTGRES_DB. Media Files If you have a volume pointing to where the media files are stored, replace all files with the ones present on the downloaded backup file. Else: Bring the dashoard container up docker-compose up -d dashboard Enter in the container docker exec -it [CONTAINER_ID] bash If you dont know where the media files are stored you can check the value of the MEDIA_ROOT variable python manage.py shell from django.conf import settings print(settings.MEDIA_ROOT) Remove the entire MEDIA_ROOT directory and exit the container Copy the media directory present on the backup file to the catalogue container docker cp -a collected-media [CONTAINER_ID]:[MEDIA_ROOT_PARENT_PATH] "],["useful-stuff.html", "5.2 Useful stuff", " 5.2 Useful stuff How to create a shared link to a dropbox directory using its pythons API: pip install dropbox import dropbox d = dropbox.Dropbox(API_TOKEN) # create a shared link for a directory from dropbox.sharing import SharedLinkSettings sharing_settings = SharedLinkSettings(require_password=True, link_password=DIRECTORY_PASSWORD) d.sharing_create_shared_link_with_settings(DIRECTORY_PATH, sharing_settings) # get all links for link in d.sharing_get_shared_links().links: print(f&quot;{link.path} -&gt; {link.url}&quot;) "],["customizations.html", "Chapter 6 Customizations", " Chapter 6 Customizations This platform is currently being used within the scope of the European Health Data &amp; Evidence Network (EHDEN) project. To allow the dashboard viewer Django application to be easily used by another project or company, several components support customization in runtime, removing the need to change such things directly on the source code. To achieve this we make use of Constance that allows configuring several fields which then can be changed through the Django admin app. Platform Logo It is visible both in the Tabs Manager and the Catalogue Results Uploader URLs. The platform allows two possible ways to choose a logo: upload a file or provide an URL to an image. If both fields are provided, the URL one will be used. On the tabs manager app, we also allow customization of the CSS associated both with the image itself and its container. Platform Title All pages of the uploader app use the same base HTML file which contains a header with the platform logo, page title, and platform title. The first was already mentioned before, the second cant be changed. The last can be altered using a Constance field. Uploader Page Texts The data source creation page has three columns with some text providing some instructions for the creation of a data source and the upload of catalogue results. The text of these three columns is customizable, where markdown can be used, which is then transformed into HTML before rending the page. Allow Draft Status Updates In the section Draft Status of the Processes chapter, it was already explained the concept around draft data sources. By default, a user can NOT change the data source status on the edit page of a data source, only being allowed to do it through a PATCH request. Changes through the web edit form can be allowed by changing a Constance field. Them an additional draft field will be available on the edit data source form. "],["development-instructions.html", "Chapter 7 Development Instructions", " Chapter 7 Development Instructions Repository Structure Description backups: Scripts and configuration files to perform backups of all the data involved in the Network Dashboards applications (Dashboard viewer + Superset) dashboard_viewer: The Dashboard Viewer Django application to manage and upload catalogue results data. More detail can be found in the Code Documentation chapter. demo: Files that can be used to test some processes of the platform (Upload catalogue results data and import a simple dashboard) docker: Docker-compose stack-related directories. Environment file Configuration directories (Nginx and Postgres) Custom Superest Dockerfile For more information about docker deployment consult the Installation chapter. docs: Where the files of this gitbook are hosted. Other output formats can also be obtained here. Consult the Documentation section of this chapter for more details. superset: contains a submodule to the latest supported version of Supersets repository and our custom chart plugins tests: contains files to launch a docker-compose stack specific to run tests. requirements-dev: python requirements files to the several tools to either perform code style checks or to run Django tests .pre-commit-config.yaml: configuration for the pre-commit tool. This is not mandatory to use but is a good tool to automatically fix problems related to code style on staged files setup.cfg: configurations for the several code style tools tox.ini: configuration for the tox tool. It helps automate the process to check if the code style is correct and if the Django tests are passing Its extremely useful in this context since different code style check tools that we use have some conflicts with python dependencies. It creates a virtual environment for each tox environment, in our case, for each code style check tool plus Django tests Superset Currently, we have a custom chart plugin on our superset installation which doesnt allow us to use supersets pre-built images available on their docker hub, since we have to call npms build procedures on the front-end code. To build our custom docker image we used supersets Dockerfile as a base, where we removed the Dev section and added some code to install our chart plugins before building the front-end code. Also, to make Superset import our custom chart plugins, some changes have to be made to the superset-frontend/src/visualizations/presets/MainPreset.js file. The changes made to the Dockerfile to install the chart plugins are in this area: L44: First we copy the superset/plugins directory into the container, which contains all the extra and custom chart plugins. L48-51: Then we iterate over the chart plugins and execute npm install ... on each of them. This will make changes to both the package.json and package-lock.json files and for that, we copy them into a temporary directory package_json_files. L54: Then all supersets front-end code is copied into the container, which will override the package*.json files. L56: After this, we copy our custom MainPresets.js file. L60-L63: Finally, we replace the package*.json files with the ones that we saved earlier and then run the npm build command. Update Superset cd into supersets submodule directory. Get the latest tags: git fetch. Checkout to the new desired release tag. Check if there are any changes made to supersets Dockerfile (on the root of the repository for the current latest release), adapt them, and insert them on our custom Dockerfile under the docker/superset directory. Check if there are any changes made to supersets superset-frontend/src/visualizations/presets/MainPreset.js file. You can use the script mainpreset_has_changes.py under the plugins directory to check that. Apply the new changes, if any, and remember to keep our chart plugins imported and registered (Currently we only have the Box plot plugin). If the version of the frontend package @superset-ui/plugin-chart-echarts changed its necessary to update our box plot plugin. Follow the instructions present here, also take into account the instruction of the next section. Chart Plugin Development Instructions on how you can set up your development environment to develop on a custom superset chart plugin: Clone the superset repository. IMPORTANT NOTE: Since we build the supersets docker image using the existing supersets submodule, its better not to use it to develop the plugins. If you decide to use it anyways, remember this and this steps. They might override directories (superset-frontend/node_modules and superset/static/assets) that are generated during the build process, which can cause frontend compilation errors or the app can serve outdated static files. Clone the superset-ui repository into the directory superset-frontend of supersets repository. Follow the instructions of this tutorial to create the necessary base files of your plugin. Copy the file MainPreset.js present on this directory into the superset repository into the superset-frontend/src/visualizations/presets/ directory. Add the line npm install -f --no-optional --save ./superset-frontend/superset-ui/plugins/plugin-chart-[your-chart-name] into the file docker/docker-frontend.sh of the superset repository before the existing npm install ... commands. When the development is finished, on the root of the superset-ui repository run yarn install and then yarn build [your-chart-name]. Copy the directory of your plugin (including its sub-directory esm), within the superset-ui repository within the directory plugins, into the sub-directory plugins this directory. Make sure to run the command yarn build [your-chart-name] before doing this step. Important features Standalone Mode: by appending ?standalone=true to the URL of a dashboard supersets menu bar wont show. New versions support ?standalone=1 or ?standalone=2 where the first does the same as ?standalone=true and the second also hides the bar containing the name of the dashboard, leaving just the charts. Filters: check this faq entry Append ?preselect_filters={\"chartId\":{\"columnToFilterBy\":[\"value1\", \"value2\"]}} to the dashboard URL to apply a filter once the dashboard is loaded. E.g. ?preselect_filters={\"13\":{\"name\":[\"Demo University of Aveiro\"]}} Custom label colors: check this faq entry Github Actions Github has a feature that allows performing automatic actions after a certain event happens on the repository. We use this feature to execute to check if everything is alright with new PR before merging them to dev. Github calls a job a set of steps that are executed after a certain event. Then several jobs can be groups in workflows. Events are defined at the workflow level, so all the jobs in a workflow will execute at the same time. We have two workflows: Code analysis checks Django tests The first has three jobs black: ensures that pythons code format is consistent throughout the project isort: sorts and organizes import statements prospector: executes a set of tools that perform some code analysis The second has just one job that executes the Django tests. Both workflows execute on commits of pull requests that will be merged into the dev branch. Regarding the code analysis workflow, the three tools used have requirements that conflict with each other, for that there is a requirements file for each tool on the requirement-dev directory of the repository. To avoid having three different virtual environments for each tool, you can use the tox. You just need to install the development requirements (pip install -r requirements-dev/requirements-dev.txt) and then just run tox. It will manage the necessary virtual environments and install the requirements for each tool. If you, however, want to run a specific tool manually you can check the tox configuration file (tox.ini). For example for the prospector tool the tox configuration is the following: [testenv:prospector] basepython = python3.8 deps = -r{toxinidir}/requirements-dev/requirements-prospector.txt -r{toxinidir}/dashboard_viewer/requirements.txt commands = prospector dashboard_viewer prospector docker/superset we can see that it installs the requirement for the prospector tool and also the requirements of the Dashboard Viewer Django app and then runs two commands. For both black and isort tools, when you run tox, it will show the necessary changes that are required to make the code good. You can apply the changes automatically by executing the tools manually without the --check and --check-only options respectively. Sometimes prospector can be a pain in the boot, complaining about too much stuff. You can make prospector ignore some bad stuff by adding the comment, # noqa, to the end of the specific line where it is complaining. Tests Our tests use Djangos building testing features, which uses unittest under the hood. Not all featured have tests associated, however, there are already some tests scenarios in mind written as issues on the repository, which have the tag Test Use Case. To run the tests we set up a docker-compose stack, under the test directory which has just the necessary data containers (Redis and Postgres) to avoid having to make changes on the development/production docker-compose stack. Once the stack is up it only necessary to run SECRET_KEY=secret python manage.py test to execute the tests. If you are developing any tests that involve celery, there is no need to have a celery process running, since on Djangos settings.py we set the test runner to the celery one. This way the python manage.py test is enough to test the whole application. Python Requirements The python requirements for the Dashboard Viewer Django app are present on the requirements.txt file of the dashboard_viewer directory. The file is divided into two sections. First are the direct dependencies. Dependencies that are directly used or imported by the Dashboard Viewer Django app. For better maintainability, every direct dependency has a small description in front of it, so any developer knows why it is being mentioned in the requirements file. The second part of the file contains the indirect dependencies. Basically dependencies of our direct dependencies. After any update is made to the direct dependencies the following procedure should be followed: Create a new virtual environment just for the dependencies of this file Delete the indirect dependencies section of the file Install all the direct dependencies pip install -r requirements.txt Append the result of pips freeze to the requirements file pip freeze &gt;&gt; requirements.txt Remove from the second section of the file, duplicated entries of the first section of the file, in other words, remove from the indirect dependencies section the direct dependencies. With #185 we intend to start using the pip-compile tool. With it, we can have a file with the direct dependencies (requirements.in), and then pip-compile reads that file and automatically creates a requirements.txt file with all the dependencies and which package requires that specific dependency. The update process of dependencies will then just be Install the pip-compile tool pip install pip-tools Make the change to the direct dependencies on the requirements.in file (No need for a virtual environment) Call the pip-compile tool on the requirement.in file pip-compile requirements.in Documentation The plan is to have all the documentation on this git book and any other places that might require some description/information should point to this GitBook so we maintain a commonplace for all the documentation. This way we can make sure that the code and the documentation are in the same place since on a pull request for a specific feature or a bug fix, associated documentation should also be changed with it. The manual was written in RMarkdown using the bookdown package. All the code is stored in the docs/src directory as well as the script to build all the documentation. Do not change the files in the root of the docs directory, because those files will be removed during the build processed and replaced by the new ones. Therefore, to update this documentation, apply the changes to the files in the directory docs/src. To build the documentation, you need to have R installed, and if you are using UNIX-based systems, you only need to run sh _build.sh in the docs/src directory. In this documentation, we also describe all the settings around the dashboards that are used on the EHDEN project. To avoid an extensive table of contents and also to avoid having a big chapter page for dashboards, we configured this GitBook to split different sections into different pages. A section on the GitBook is mapped to markdown headings elements of level 2 (H2 or ##). This is, however, inconvenient for small chapters like the preface (index.Rmd). To make it render all the sections on the same page, instead of using headings of level 2 (##) you should use level 3 (###). Although this will make the section numeration start at 0, e.g 1.0.1, 1.0.2,  To avoid this we appended {-} to the sections titles so that the numeration does not show. If a new file is created with more documentation, its name should be placed, including extension, in the desired location in this list of the docks/src/_bookdown.yml file. "],["code-documentation.html", "Chapter 8 Code Documentation", " Chapter 8 Code Documentation Apps Materialized Queries Manager Models This app has only one model, MaterializedQuery, which maps to a Postgres materialized view. To avoid having to maintain the consistency between both the records of this Django app and the Postgres materialized views: the managed Meta flag was set to False to avoid Django creating migrations to the model the db_table Meta flag was set to the name of the table where Postgres stores the information about the existing materialized views (pg_matviews). the fields of the model, matviewname and definition, use the same name and type as the ones of the pg_matviews Postgres table. Views This app has no view exposed since all operations to the MaterializedQuery models are expected to be performed in the Django admin app. However, we had to change Djangos default behaviors for the create, update and delete operations of the model. For the delete operation, we overrode the delete method of the MaterializedQuery Django model to just execute a DROP MATERIALIZED VIEW SQL statement. Related to creation and update we had to change some internal methods of Djangos admin app ModelAdmin base class. _changeform_view: where Model records were being created. Instead, CREATE MATERIALIZED VIEW and ALTER MATERIALIZED VIEW SQL statements are executed. However, since some materialized views might take some time to build, create a record like this could lead to a browser timeout. We then decided to execute these statements in a celery background task. The main changes were made here where we launch the background task. response_add: Since the materialized view might not be created the right way, saying A record was created successfully is not adequate. We then changed the message that is presented after the creation to tell in the id of the background task that is creating the materialized query. The result of the query can then be consulted on the associated Task Results record on the Celery Results section app of the Django admin console. response_change: changes here with the same ideas behind as response_add. If any catalogue results files are being uploaded to the platform, any worker attempting to create or change a materialized view will block until such data is uploaded. Also if any worker is creating materialized views, no other worker can upload catalogue results data. Through the admin console, there is also the possibility to refresh a specific MaterializedQuery. To do so, on the list view, select the MaterializedQueries to refresh, then on the actions dropdown select Refresh selected materialized queries. Once again to avoid timeouts, such operations are executed on a background task. Tabs Manager Currently, this app is not being used and the URL mapping was delete. To use it again uncomment the tabsManager line on the dashboard_viewer/dashboard_viewer/urls.py file. Then you can access the tabs page through the [BASE_RUL]/tabs/ URL. Views On this app, there is only one view. It is a simple page with just a sidebar to choose which dashboard to displays on an iframe. Besides the simplicity, all the animations around the sidebar buttons are handled by CSS with some JS that adds and removes classes to HTML elements, as events (hover and click) happen. To facilitate the development process of CSS, SCSS was used to build styling of the view. It prevents duplication with the addition of variables and adds the possibility to express parent classes by nesting their declaration. In cases where there are a lot of buttons on the sidebar, some buttons might get impossible to reach since they are out of the field of view. To avoid this we make use of SimpleBar, which makes the sidebar scrollable, displaying a scroll bar on the right side of the sidebar whenever there are elements outside of the field of view. API There is one endpoint, [BASE_URL]/api/, where a JSON object of tabs and groups of tabs and their sub-tabs are returned. Models Uploader Views This app exposes three views: 1. Creation of a data source 2. Edition of a data source 3. To Upload or consult the history of uploads of catalogue results files. The first one can be accessed through the [BASE_URL]/uploader/[DATA_SOURCE_HASH]/ URL. If no hash is provided on the URL then on the creation of the data source a random one will be assigned. If there is already a data source with the provided hash then the user is redirected to the upload page of that data source. This view also allows creating data sources without displaying the webform, redirecting directly to the uploader page. This can be achieved by providing the data of several fields of the form as URL arguments. E.g. [BASE_URL]/uploader/[DATA_SOURCE_HASH]/?acronym=test.... This is implemented in a way so that whenever a GET is performed, it checks the URL arguments and tries to submit the data source form. If it is valid, all the required fields were provided and are valid, then the user is redirected to the upload page. Else all the valid values are set in the form, the invalid ones are being discarded, and the data source creation page is presented with no error messages. The country field should contain a value from the ones available on the dropdown presented in the webform and since the coordinates is a two-component value it should be provided as coordinates_0=[LATITUDE]&amp;coordinates_1=[LONGITUDE]. It is important to note that this view does not require a CSRF token, so a normal POST form submission can be performed to create a data source. The second one can be accessed through the [BASE_URL]/uploader/[DATA_SOURCE_HASH]/edit/ URL or by clicking on the Edit button on the data source upload page. Finally, on the upload page, a data owner can consult the history of uploads, their state, and eventually error messages if some went wrong. Whenever an upload is made its state will be pending. After the upload, with a 5-second interval, a request is made to the backend to check if the status of the upload changed. If it fails, an error message will be provided in a tooltip above a button with a message icon. Else the state will change to Done and the information about the upload retrieved from the uploaded file, present on the check status request, is filled. Related to file uploading, after the file form is submitted no validation is made and a message is presented to the user telling that the file is being processed in the background, then the fetch status process mentioned before starts. If validations were performed before returning a message to the user, if the validation took too much time, the browser could timeout. Also if some unexpected error happened on the insertion process performed in the background, the user would get any feedback. Related to the background task that validates and uploads the data, the validation can fail if: Error Message Invalid Number of Columns The provided file has an invalid number of columns Invalid CSV File Format The provided file has an invalid CSV format. Make sure is a text file separated by commas and you either have 7 (regular results file) or 13 (results file with dist columns) columns. Missing Required Fields Some rows have null values either on the column analysis_id or count_value Invalid Field Types The provided file has invalid values on some columns. Remember that only the \"stratum_*\" columns accept strings, all the other fields expect numeric types. Duplicated Metadata Rows Analysis id[output] duplicated on multiple rows. Try (re)running the plugin CatalogueExport on your database. Missing Required Metadata Row Analysis id 0 is missing. Try (re)running the plugin CatalogueExport on your database. Any other error is considered an unexpected error and the following message will be presented An unexpected error occurred while processing your file. Please contact the system administrator for more details.. If the file passes all validations, it goes to the upload data phase. Here, if workers are creating or refreshing materialized queries then the worker blocks. If there are other workers inserting data for the same data source it will also block. However, several workers of different data sources can insert data at the same time. All the workers, after inserting the data, check if they are the only worker inserting data. If so they refresh the existing materialized queries. Else the next worker to finish inserting data will do the same check. Widgets For the data source form two custom widgets were created for the following fields: Database Type: To avoid having duplicate entries with the same meaning (e.g.Hospital, hospital), the input of this field has a autocomplete list where existing values are suggested to the user. Also before saving the field to the database spaces are trimmed and the values are transformed into title case here. Coordinates: 1. This is a two-component field; 2. Inserting coordinates by hand is tedious. Considering the previous points, we created a widget with a map built with leaflet where the user just needs to click on the map. API This app provided two API endpoints Update data source information: a PATCH request with a JSON object on the body of the request with the fields and their new values. Pending upload status: a GET request that returns JSON data where there is always a status field that can have three statuses which then can lead to additional data be also present: Pending: the upload in question hasnt finished Done: the upload finished and there was nothing wrong with the uploaded file. Along with the status, there will be a data field with a JSON object with the fields r_package_version, generation_date, cdm_version, and vocabulary_version which are data source information that was extracted from the uploaded file. Failed: the upload finished but there was something wrong with the uploaded file. Along with the status, there will be a failure_msg field telling the reason for the failure. Models Country data is loaded in a fresh installation through the docker-init.sh script if no records are present on the Country table. The DataSource model doesnt have a foreign key to the DatabaseType model to then facilitate the creation of SQL queries to feet Supersets dashboards. The DatabaseType is used anyway to have a faster way to check if a certain database type already exists on the database, avoiding going through every DataSource record. The same situation of the DatabaseType model also happens between the UploadHistory and PendingUpload models. There is no foreign key between a UploadHistory and a PendingUpload. This is because PendingUpload records are deleted once an upload is successful. When the upload view requests the status of a certain upload, it uses the id of the pending upload. If no pending upload is found, it is assumed that the upload was successful and searches for uploads on the UploadHistory model with the pending_upload_id field equal to the certain upload id. Related to where the uploaded files are stored, within the media directory there will be a ACHILLES_RESULTS_STORAGE_PATH directory which will have a directory for each data source. Within this last directory, first, files are uploaded to a failure directory. If the upload is successful the file is moved to a success directory. In both cases, the file name will be the date of when the file is being saved into disk plus its original extensions. JavaScript Packages While developing the templates for Django views, if a certain javascript library is required, like jquery, one option is to insert script tags on the templates and point the src to a CDN. However, this makes the process of maintaining the libraries tedious since a developer has to search and change all the script tags if for example wants to update the librarys version. To avoid this problem we have a package.json file where we define all the libraries that we use and their version. Then we add the node_modules directory as a static file directory. With this alternative, updating a library is as simple as changing a number of the package.json file, run npm install and collect the static files again. "],["dashboards.html", "Chapter 9 Dashboards ", " Chapter 9 Dashboards "],["PerDatabaseDashboard.html", "9.1 Network Dashboard", " 9.1 Network Dashboard Label Colors In order to obtain the colors blue and rose in the chart representing the gender distribution, add the following JSON entry to the JSON object of the JSON Metadata field on the edit dashboard page: &quot;label_colors&quot;: { &quot;Male&quot;: &quot;#3366FF&quot;, &quot;Female&quot;: &quot;#FF3399&quot; } CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the Edit Dashboard button can show again. Filters Country Filter Dataset: Materialized View meta_data_table Database Type Filter Dataset: Materialized View meta_data_table Data Source Filter Dataset: Materialized View meta_data_table Overview Tab Countries Dataset: Materialized View meta_data_table Data Sources Dataset: Materialized View meta_data_table Datasource Types Dataset: Materialized View meta_data_table Patients Dataset: Materialized View meta_data_table Patients Dataset: Materialized View meta_data_table Patients by Country Dataset: Materialized View meta_data_table Database Types per Country Dataset: Materialized View meta_data_table Meta Data Dataset: Materialized View meta_data_table Demographics Tab Number of Patients Dataset: Materialized View number_of_patients Gender Table Dataset: Materialized View gender Gender Pie Dataset: Materialized View gender Age at first observation Table Dataset: Materialized View age1observation_table Age at first observation Bar Chart Dataset: Materialized View age1observation_bar_chart Distribution of age at first observation period Dataset: Materialized View distribution_of_age_at_first_observation_period Year of Birth Dataset: Materialized View year_of_birth Data Domains Tab Average number of records per person Dataset: Materialized View avg_num_of_records_per_person Total number of records Dataset: Materialized View data_domain_total_num_of_records Number of distinct visit occurrence concepts per person Dataset: Materialized View number_of_distinct_per_person Number of distinct condition occurrence concepts per person Dataset: Materialized View number_of_distinct_per_person Number of distinct procedure occurrence concepts per person Dataset: Materialized View number_of_distinct_per_person Number of distinct drug exposure concepts per person Dataset: Materialized View number_of_distinct_per_person Number of distinct observation occurrence concepts per person Dataset: Materialized View number_of_distinct_per_person Number of distinct mesurement occurrence concepts per person Dataset: Materialized View number_of_distinct_per_person Data Provenance Tab Dataset: Materialized View data_provenance Observation Period Tab Number of Patitents in Observation Period Dataset: Materialized View num_of_patients_in_observation_period Cumulative Observation Period Dataset: Materialized View cumulative_observation_time Number of Observation Periods Dataset: Materialized View number_of_observation_periods Length of observation (days) of first observation period Dataset: Materialized View length_of_observation_of_first_observation_period Visit Tab Visit Type Graph Dataset: Materialized View visit_type_bar_chart Visit Type Dataset: Materialized View visit_type_table Concept Browser Tab Domain Filter Dataset: Materialized View domain_filter Concept Browser Dataset: Materialized View concept_browser_table3 Concept Network Coverage Dataset: Materialized View concept_coverage2 About Tab Markdown dashboard components "],["database-level-dashboard.html", "9.2 Database-Level Dashboard", " 9.2 Database-Level Dashboard This dashboard is an exact copy of the Network Dashboard dashboard but several legends and fields displayed on the original are hidden either through CSS or by changing some chart settings. On the following sections we will only present the things to change on the original charts. Label Colors In order to obtain the colors blue and rose in the chart representing the gender distribution, add the following JSON entry to the JSON object of the JSON Metadata field on the edit dashboard page: &quot;label_colors&quot;: { &quot;Male&quot;: &quot;#3366FF&quot;, &quot;Female&quot;: &quot;#FF3399&quot; } CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: /* hides the filter badges on right side of charts */ .dashboard-filter-indicators-container { display: none; } /* hides the acronym filter */ .grid-content &gt; .dragdroppable.dragdroppable-row &gt; .with-popover-menu { display: none; } /* * WARNING panel 1 id hardcoded * Hides the X Axis Label of the heatmap on the Data Domains tab */ #TABS-nlIU6H5mcT-pane-1 g.x.axis &gt; g.tick text { display: none; } /* * WARNING panel 2 id hardcoded * Hides the X Axis Labels of the bar charts on the Data Provenance tab */ #TABS-nlIU6H5mcT-pane-2 g.nv-x.nv-axis.nvd3-svg &gt; g.nvd3.nv-wrap.nv-axis &gt; g &gt; g.tick.zero &gt; text { display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the Edit Dashboard button can show again. Data Source Filter - hidden Dataset: data_source table of the achilles database. For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. Demographics Tab Number of Patients No changes Gender Table No changes Gender Pie No changes Age at first observation - Bars Remove legend. Customize Tab Chart Options Legend: off Distribution of age at first observation period No changes Year of Birth Remove legend. Customize Tab Chart Options Legend: off Data Domains Tab Average number of records per person No changes Total number of records No changes Data Density Plot Dataset: Materialized View data_density Records per person Dataset: Materialized View records_per_person Concepts per person Dataset: Materialized View number_of_distinct_per_person Data Provenance Tab Type Concepts Dataset: Materialized View data_provenance Observation Period Tab Number of Patitents in Observation Period Remove legend. Customize Tab Chart Options Legend: off Length of observation (days) of first observation period No changes Cumulative Observation Period Remove legend. Customize Tab Chart Options Legend: off Number of Observation Periods No changes Visit Tab Visit Type Graph Remove legend. Customize Tab Chart Options Legend: off Visit Type Table Remove the name field from the columns to display. Data Tab Query Columns: visit_type, num_persons, percent_persons with label persons (%), records_per_person Visit Age Distribution Dataset: Materialized View visit_age_distribution Concept Browser Tab Domain Filter No changes Concept Browser Dataset: Materialized View concept_browser_table2 Meta Data Tab Meta Data Dataset: Materialized View meta_data_table "],["materialized-views-1.html", "9.3 Materialized views", " 9.3 Materialized views meta_data_table SELECT data_source.acronym, data_source.name, data_source.database_type, country.country, p.count_value AS number_of_patients, a.stratum_2 AS source_release_date, a.stratum_3 AS cdm_release_date, a.stratum_4 AS cdm_version, a.stratum_5 AS vocabulary_version, p.stratum_3 AS execution_date, p.stratum_2 AS package_version FROM (((achilles_results a JOIN data_source ON ((a.data_source_id = data_source.id))) JOIN country ON ((data_source.country_id = country.id))) JOIN ( SELECT achilles_results.count_value, achilles_results.data_source_id, achilles_results.stratum_2, achilles_results.stratum_3 FROM achilles_results WHERE (achilles_results.analysis_id = 0)) p ON ((p.data_source_id = data_source.id))) WHERE (a.analysis_id = 5000); patients_per_country_and_database_type SELECT country.country, source.database_type, achilles.count_value FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country country ON ((source.country_id = country.id))) WHERE (achilles.analysis_id = 1); number_of_patients SELECT achilles_results.count_value, data_source.name, data_source.acronym, data_source.database_type, country.country FROM ((achilles_results JOIN data_source ON ((achilles_results.data_source_id = data_source.id))) JOIN country ON ((data_source.country_id = country.id))) WHERE (achilles_results.analysis_id = 1); gender SELECT source.name, source.acronym, source.database_type, country.country, concept.concept_name AS gender, achilles.count_value FROM (((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) JOIN concept ON ((achilles.stratum_1 = (concept.concept_id)::text))) WHERE (achilles.analysis_id = 2); age1observation_table SELECT source.name, source.acronym, source.database_type, country.country, sum( CASE WHEN ((achilles.stratum_2)::integer &lt; 10) THEN achilles.count_value ELSE NULL::bigint END) AS &quot;0-10&quot;, sum( CASE WHEN (((achilles.stratum_2)::integer &gt;= 10) AND ((achilles.stratum_2)::integer &lt; 20)) THEN achilles.count_value ELSE NULL::bigint END) AS &quot;10-20&quot;, sum( CASE WHEN (((achilles.stratum_2)::integer &gt;= 20) AND ((achilles.stratum_2)::integer &lt; 30)) THEN achilles.count_value ELSE NULL::bigint END) AS &quot;20-30&quot;, sum( CASE WHEN (((achilles.stratum_2)::integer &gt;= 30) AND ((achilles.stratum_2)::integer &lt; 40)) THEN achilles.count_value ELSE NULL::bigint END) AS &quot;30-40&quot;, sum( CASE WHEN (((achilles.stratum_2)::integer &gt;= 40) AND ((achilles.stratum_2)::integer &lt; 50)) THEN achilles.count_value ELSE NULL::bigint END) AS &quot;40-50&quot;, sum( CASE WHEN (((achilles.stratum_2)::integer &gt;= 50) AND ((achilles.stratum_2)::integer &lt; 60)) THEN achilles.count_value ELSE NULL::bigint END) AS &quot;50-60&quot;, sum( CASE WHEN (((achilles.stratum_2)::integer &gt;= 60) AND ((achilles.stratum_2)::integer &lt; 70)) THEN achilles.count_value ELSE NULL::bigint END) AS &quot;60-70&quot;, sum( CASE WHEN (((achilles.stratum_2)::integer &gt;= 70) AND ((achilles.stratum_2)::integer &lt; 80)) THEN achilles.count_value ELSE NULL::bigint END) AS &quot;70-80&quot;, sum( CASE WHEN (((achilles.stratum_2)::integer &gt;= 80) AND ((achilles.stratum_2)::integer &lt; 90)) THEN achilles.count_value ELSE NULL::bigint END) AS &quot;80-90&quot;, sum( CASE WHEN ((achilles.stratum_2)::integer &gt;= 90) THEN achilles.count_value ELSE NULL::bigint END) AS &quot;90+&quot; FROM (((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) JOIN concept ON ((achilles.stratum_1 = (concept.concept_id)::text))) WHERE (achilles.analysis_id = 102) GROUP BY source.name, source.acronym, source.database_type, country.country; age1observation_bar_chart SELECT source.name, (achilles.stratum_1)::integer AS age, achilles.count_value AS count, source.acronym, source.database_type, country.country FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) WHERE (achilles.analysis_id = 101); distribution_of_age_at_first_observation_period SELECT source.name, source.acronym, country.country, achilles.count_value, achilles.p10_value AS p10, achilles.p25_value AS p25, achilles.median_value AS median, achilles.p75_value AS p75, achilles.p90_value AS p90, achilles.max_value, achilles.min_value FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((source.country_id = country.id))) WHERE (achilles.analysis_id = 103) ORDER BY source.name; year_of_birth SELECT source.name, source.acronym, source.database_type, country.country, achilles.stratum_1 AS &quot;Birth_year&quot;, achilles.count_value AS count FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) WHERE (achilles.analysis_id = 3); avg_num_of_records_per_person SELECT source.name, source.acronym, source.database_type, country.country, CASE WHEN (achilles.analysis_id = 201) THEN &#39;Visit&#39;::text WHEN (achilles.analysis_id = 401) THEN &#39;Condition&#39;::text WHEN (achilles.analysis_id = 501) THEN &#39;Death&#39;::text WHEN (achilles.analysis_id = 601) THEN &#39;Procedure&#39;::text WHEN (achilles.analysis_id = 701) THEN &#39;Drug Exposure&#39;::text WHEN (achilles.analysis_id = 801) THEN &#39;Observation&#39;::text WHEN (achilles.analysis_id = 1801) THEN &#39;Measurement&#39;::text WHEN (achilles.analysis_id = 2101) THEN &#39;Device&#39;::text WHEN (achilles.analysis_id = 2201) THEN &#39;Note&#39;::text ELSE NULL::text END AS data_domain, (sum(achilles.count_value) / avg(counts.num_persons)) AS records_per_person FROM (((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) JOIN ( SELECT achilles_results.data_source_id, achilles_results.count_value AS num_persons FROM achilles_results WHERE (achilles_results.analysis_id = 1)) counts ON ((achilles.data_source_id = counts.data_source_id))) GROUP BY achilles.analysis_id, source.name, source.acronym, source.database_type, country.country HAVING (achilles.analysis_id = ANY (ARRAY[(201)::bigint, (401)::bigint, (501)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint, (2201)::bigint])); data_domain_total_num_of_records SELECT data_source.name, data_source.acronym, data_source.database_type, country.country, CASE WHEN (achilles_results.analysis_id = 201) THEN &#39;Visit&#39;::text WHEN (achilles_results.analysis_id = 401) THEN &#39;Condition&#39;::text WHEN (achilles_results.analysis_id = 501) THEN &#39;Death&#39;::text WHEN (achilles_results.analysis_id = 601) THEN &#39;Procedure&#39;::text WHEN (achilles_results.analysis_id = 701) THEN &#39;Drug Exposure&#39;::text WHEN (achilles_results.analysis_id = 801) THEN &#39;Observation&#39;::text WHEN (achilles_results.analysis_id = 1801) THEN &#39;Measurement&#39;::text WHEN (achilles_results.analysis_id = 2101) THEN &#39;Device&#39;::text WHEN (achilles_results.analysis_id = 2201) THEN &#39;Note&#39;::text ELSE NULL::text END AS data_domain, sum(achilles_results.count_value) AS count FROM ((achilles_results JOIN data_source ON ((achilles_results.data_source_id = data_source.id))) JOIN country ON ((country.id = data_source.country_id))) GROUP BY data_source.name, data_source.acronym, data_source.database_type, country.country, achilles_results.analysis_id HAVING (achilles_results.analysis_id = ANY (ARRAY[(201)::bigint, (401)::bigint, (501)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint, (2201)::bigint])); number_of_distinct_per_person SELECT source.name, source.acronym, country.country, achilles.analysis_id, CASE WHEN (achilles.analysis_id = 203) THEN &#39;Visit&#39;::text WHEN (achilles.analysis_id = 403) THEN &#39;Condition&#39;::text WHEN (achilles.analysis_id = 603) THEN &#39;Procedure&#39;::text WHEN (achilles.analysis_id = 703) THEN &#39;Drug Exposure&#39;::text WHEN (achilles.analysis_id = 803) THEN &#39;Observation&#39;::text WHEN (achilles.analysis_id = 1803) THEN &#39;Measurement&#39;::text ELSE NULL::text END AS data_domain, achilles.count_value, achilles.min_value, achilles.p10_value AS p10, achilles.p25_value AS p25, achilles.median_value AS median, achilles.p75_value AS p75, achilles.p90_value AS p90, achilles.max_value FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((source.country_id = country.id))) WHERE (achilles.analysis_id = ANY (ARRAY[(203)::bigint, (403)::bigint, (603)::bigint, (703)::bigint, (803)::bigint, (183)::bigint])) ORDER BY source.name; data_provenance SELECT source.name, source.acronym, source.database_type, country.country, CASE WHEN (achilles.analysis_id = 405) THEN &#39;Condition&#39;::text WHEN (achilles.analysis_id = 605) THEN &#39;Procedure&#39;::text WHEN (achilles.analysis_id = 705) THEN &#39;Drug&#39;::text WHEN (achilles.analysis_id = 805) THEN &#39;Observation&#39;::text WHEN (achilles.analysis_id = 1805) THEN &#39;Measurement&#39;::text WHEN (achilles.analysis_id = 2105) THEN &#39;Device&#39;::text ELSE &#39;Other&#39;::text END AS domain_name, c1.concept_name, sum(achilles.count_value) AS num_records FROM (((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) JOIN concept c1 ON ((achilles.stratum_2 = (c1.concept_id)::text))) WHERE (achilles.analysis_id = ANY (ARRAY[(405)::bigint, (605)::bigint, (705)::bigint, (805)::bigint, (1805)::bigint, (2105)::bigint])) GROUP BY source.name, source.acronym, source.database_type, country.country, c1.concept_name, CASE WHEN (achilles.analysis_id = 405) THEN &#39;Condition&#39;::text WHEN (achilles.analysis_id = 605) THEN &#39;Procedure&#39;::text WHEN (achilles.analysis_id = 705) THEN &#39;Drug&#39;::text WHEN (achilles.analysis_id = 805) THEN &#39;Observation&#39;::text WHEN (achilles.analysis_id = 1805) THEN &#39;Measurement&#39;::text WHEN (achilles.analysis_id = 2105) THEN &#39;Device&#39;::text ELSE &#39;Other&#39;::text END; num_of_patients_in_observation_period SELECT source.name, source.acronym, source.database_type, country.country, to_date(achilles.stratum_1, &#39;YYYYMM&#39;::text) AS date, achilles.count_value AS &quot;Nr_patients&quot; FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) WHERE (achilles.analysis_id = 110); cumulative_observation_time SELECT data_source.name, data_source.acronym, data_source.database_type, country.country, cumulative_sums.xlengthofobservation, round((cumulative_sums.cumulative_sum / (totals.total)::numeric), 5) AS ypercentpersons FROM (((( SELECT achilles_results.data_source_id, ((achilles_results.stratum_1)::integer * 30) AS xlengthofobservation, sum(achilles_results.count_value) OVER (PARTITION BY achilles_results.data_source_id ORDER BY (achilles_results.stratum_1)::integer DESC) AS cumulative_sum FROM achilles_results WHERE (achilles_results.analysis_id = 108)) cumulative_sums JOIN ( SELECT achilles_results.data_source_id, achilles_results.count_value AS total FROM achilles_results WHERE (achilles_results.analysis_id = 1)) totals ON ((cumulative_sums.data_source_id = totals.data_source_id))) JOIN data_source ON ((cumulative_sums.data_source_id = data_source.id))) JOIN country ON ((country.id = data_source.country_id))) ORDER BY data_source.name, cumulative_sums.xlengthofobservation; number_of_observation_periods SELECT ar.data_source_id AS id, ds.acronym, ds.name, country.country, ar.stratum_1, ar.count_value, pa.nrpatients AS patients, round((((100)::numeric * (ar.count_value)::numeric) / (pa.nrpatients)::numeric), 2) AS percentage FROM (((achilles_results ar JOIN data_source ds ON ((ds.id = ar.data_source_id))) JOIN country ON ((ds.country_id = country.id))) JOIN ( SELECT achilles_results.count_value AS nrpatients, achilles_results.data_source_id FROM achilles_results WHERE (achilles_results.analysis_id = 0)) pa ON ((pa.data_source_id = ds.id))) WHERE (ar.analysis_id = 113); length_of_observation_of_first_observation_period SELECT source.name, source.acronym, country.country, achilles.count_value, achilles.min_value, achilles.p10_value AS p10, achilles.p25_value AS p25, achilles.median_value AS median, achilles.p75_value AS p75, achilles.p90_value AS p90, achilles.max_value FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((source.country_id = country.id))) WHERE (achilles.analysis_id = 105) ORDER BY source.name; visit_type_bar_chart SELECT data_source.name, data_source.acronym, data_source.database_type, country.country, concept.concept_name, achilles_results.count_value AS num_persons FROM (((( SELECT achilles_results_1.id, achilles_results_1.analysis_id, achilles_results_1.stratum_1, achilles_results_1.stratum_2, achilles_results_1.stratum_3, achilles_results_1.stratum_4, achilles_results_1.stratum_5, achilles_results_1.count_value, achilles_results_1.data_source_id, achilles_results_1.avg_value, achilles_results_1.max_value, achilles_results_1.median_value, achilles_results_1.min_value, achilles_results_1.p10_value, achilles_results_1.p25_value, achilles_results_1.p75_value, achilles_results_1.p90_value, achilles_results_1.stdev_value FROM achilles_results achilles_results_1 WHERE (achilles_results_1.analysis_id = 200)) achilles_results JOIN data_source ON ((achilles_results.data_source_id = data_source.id))) JOIN country ON ((country.id = data_source.country_id))) JOIN concept ON (((achilles_results.stratum_1)::integer = concept.concept_id))); visit_type_table SELECT data_source.name, data_source.acronym, data_source.database_type, country.country, concept.concept_name, ar1.count_value AS num_persons, round(((100.0 * (ar1.count_value)::numeric) / (denom.count_value)::numeric), 2) AS percent_persons, round(((1.0 * (ar2.count_value)::numeric) / (ar1.count_value)::numeric), 2) AS records_per_person FROM (((((( SELECT achilles_results.id, achilles_results.analysis_id, achilles_results.stratum_1, achilles_results.stratum_2, achilles_results.stratum_3, achilles_results.stratum_4, achilles_results.stratum_5, achilles_results.count_value, achilles_results.data_source_id, achilles_results.avg_value, achilles_results.max_value, achilles_results.median_value, achilles_results.min_value, achilles_results.p10_value, achilles_results.p25_value, achilles_results.p75_value, achilles_results.p90_value, achilles_results.stdev_value FROM achilles_results WHERE (achilles_results.analysis_id = 200)) ar1 JOIN ( SELECT achilles_results.id, achilles_results.analysis_id, achilles_results.stratum_1, achilles_results.stratum_2, achilles_results.stratum_3, achilles_results.stratum_4, achilles_results.stratum_5, achilles_results.count_value, achilles_results.data_source_id, achilles_results.avg_value, achilles_results.max_value, achilles_results.median_value, achilles_results.min_value, achilles_results.p10_value, achilles_results.p25_value, achilles_results.p75_value, achilles_results.p90_value, achilles_results.stdev_value FROM achilles_results WHERE (achilles_results.analysis_id = 201)) ar2 ON (((ar1.stratum_1 = ar2.stratum_1) AND (ar1.data_source_id = ar2.data_source_id)))) JOIN ( SELECT achilles_results.id, achilles_results.analysis_id, achilles_results.stratum_1, achilles_results.stratum_2, achilles_results.stratum_3, achilles_results.stratum_4, achilles_results.stratum_5, achilles_results.count_value, achilles_results.data_source_id, achilles_results.avg_value, achilles_results.max_value, achilles_results.median_value, achilles_results.min_value, achilles_results.p10_value, achilles_results.p25_value, achilles_results.p75_value, achilles_results.p90_value, achilles_results.stdev_value FROM achilles_results WHERE (achilles_results.analysis_id = 1)) denom ON ((ar1.data_source_id = denom.data_source_id))) JOIN data_source ON ((data_source.id = ar1.data_source_id))) JOIN country ON ((country.id = data_source.country_id))) JOIN concept ON (((ar1.stratum_1)::integer = concept.concept_id))) ORDER BY ar1.data_source_id, ar1.count_value DESC; domain_filter SELECT concept.concept_name, concept.domain_id, source.name, source.acronym, source.database_type, country.country FROM (((achilles_results JOIN concept ON (((achilles_results.stratum_1)::bigint = concept.concept_id))) JOIN data_source source ON ((achilles_results.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) WHERE (achilles_results.analysis_id = ANY (ARRAY[(201)::bigint, (401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (901)::bigint, (1001)::bigint, (1801)::bigint, (200)::bigint, (400)::bigint, (600)::bigint, (700)::bigint, (800)::bigint, (1800)::bigint])); concept_browser_table3 SELECT source.name, source.acronym, source.database_type, country.country, ((((&#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39;::text || ar1.concept_id) || &#39;&quot;target=&quot;_blank&quot;&gt;&#39;::text) || ar1.concept_id) || &#39;&lt;/a&gt;&#39;::text) AS concept_id, concept.concept_name, concept.domain_id, (ar1.rc)::integer AS rc, (ar2.drc)::integer AS drc FROM ((((( SELECT achilles_results.data_source_id, achilles_results.analysis_id, achilles_results.stratum_1 AS concept_id, achilles_results.count_value AS rc FROM achilles_results WHERE (achilles_results.analysis_id = ANY (ARRAY[(401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint]))) ar1 JOIN ( SELECT ar.data_source_id, ar.analysis_id, ar.stratum_1 AS concept_id, ar.count_value AS drc FROM achilles_results ar WHERE (ar.analysis_id = ANY (ARRAY[(430)::bigint, (630)::bigint, (730)::bigint, (830)::bigint, (1830)::bigint, (2130)::bigint]))) ar2 ON (((ar1.concept_id = ar2.concept_id) AND (ar1.data_source_id = ar2.data_source_id)))) JOIN data_source source ON ((ar1.data_source_id = source.id))) JOIN country ON ((source.country_id = country.id))) JOIN concept concept ON ((ar1.concept_id = (concept.concept_id)::text))) ORDER BY ((ar2.drc)::integer) DESC; concept_coverage2 SELECT source.name AS source_name, source.database_type, country.country, ((((&#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39;::text || concept.concept_id) || &#39;&quot; target=&quot;_blank&quot;&gt;&#39;::text) || concept.concept_id) || &#39;&lt;/a&gt;&#39;::text) AS concept_id, concept.concept_name, concept.domain_id, sum((ar1.rc)::integer) AS rc, sum((ar2.drc)::integer) AS drc FROM ((((( SELECT achilles_results.data_source_id, achilles_results.analysis_id, achilles_results.stratum_1 AS concept_id, achilles_results.count_value AS rc FROM achilles_results WHERE (achilles_results.analysis_id = ANY (ARRAY[(401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint]))) ar1 JOIN ( SELECT ar.data_source_id, ar.analysis_id, ar.stratum_1 AS concept_id, ar.count_value AS drc FROM achilles_results ar WHERE (ar.analysis_id = ANY (ARRAY[(430)::bigint, (630)::bigint, (730)::bigint, (830)::bigint, (1830)::bigint, (2130)::bigint]))) ar2 ON (((ar1.concept_id = ar2.concept_id) AND (ar1.data_source_id = ar2.data_source_id)))) JOIN data_source source ON ((ar1.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) JOIN concept concept ON ((ar1.concept_id = (concept.concept_id)::text))) GROUP BY source.name, source.database_type, country.country, concept.domain_id, concept.concept_id, concept.concept_name; data_density SELECT source.acronym, t1.table_name AS series_name, to_date(t1.stratum_1, &#39;YYYYMM&#39;::text) AS x_calendar_month, t1.count_value AS y_record_count FROM (( SELECT achilles_results.data_source_id AS id, &#39;Visit occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 220) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Condition occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 420) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Death&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 502) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Procedure occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 620) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Drug exposure&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 720) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Observation&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 820) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Drug era&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 920) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Device Exposure&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 2120) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Condition era&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 1020) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Observation period&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 111) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Measurement&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 1820)) t1 JOIN data_source source ON ((source.id = t1.id))) ORDER BY t1.table_name, ( CASE WHEN (t1.stratum_1 ~ &#39;^\\d+\\.?\\d+$&#39;::text) THEN t1.stratum_1 ELSE NULL::text END)::integer; records_per_person SELECT source.acronym, t1.table_name AS series_name, to_date(t1.stratum_1, &#39;YYYYMM&#39;::text) AS x_calendar_month, round(((1.0 * (t1.count_value)::numeric) / (denom.count_value)::numeric), 5) AS y_record_count FROM ((( SELECT achilles_results.data_source_id AS id, &#39;Visit occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 220) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Condition occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 420) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Death&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 502) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Procedure occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 620) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Drug exposure&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 720) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Observation&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 820) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Device exposure&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 2120) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Drug era&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 920) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Condition era&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 1020) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Observation period&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 111) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Measurement&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 1820)) t1 JOIN ( SELECT achilles_results.id, achilles_results.analysis_id, achilles_results.stratum_1, achilles_results.stratum_2, achilles_results.stratum_3, achilles_results.stratum_4, achilles_results.stratum_5, achilles_results.count_value, achilles_results.data_source_id, achilles_results.avg_value, achilles_results.max_value, achilles_results.median_value, achilles_results.min_value, achilles_results.p10_value, achilles_results.p25_value, achilles_results.p75_value, achilles_results.p90_value, achilles_results.stdev_value FROM achilles_results WHERE (achilles_results.analysis_id = 117)) denom ON (((t1.stratum_1 = denom.stratum_1) AND (t1.id = denom.data_source_id)))) JOIN data_source source ON ((source.id = t1.id))) ORDER BY t1.table_name, ( CASE WHEN (t1.stratum_1 ~ &#39;^\\d+\\.?\\d+$&#39;::text) THEN t1.stratum_1 ELSE NULL::text END)::integer; visit_age_distribution SELECT source.name, source.acronym, c1.concept_name, c2.concept_name AS gender, achilles.count_value, achilles.p10_value AS p10, achilles.p25_value AS p25, achilles.median_value AS median, achilles.p75_value AS p75, achilles.p90_value AS p90 FROM (((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN concept c1 ON ((achilles.stratum_1 = (c1.concept_id)::text))) JOIN concept c2 ON ((achilles.stratum_2 = (c2.concept_id)::text))) WHERE (achilles.analysis_id = 206) ORDER BY source.name, c1.concept_name, c2.concept_name; concept_browser_table2 SELECT source.acronym, ((((&#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39;::text || ar1.concept_id) || &#39;&quot;target=&quot;_blank&quot;&gt;&#39;::text) || ar1.concept_id) || &#39;&lt;/a&gt;&#39;::text) AS concept_id, concept.concept_name, concept.domain_id, (ar1.rc)::integer AS rc, (ar2.drc)::integer AS drc FROM (((( SELECT achilles_results.data_source_id, achilles_results.analysis_id, achilles_results.stratum_1 AS concept_id, achilles_results.count_value AS rc FROM achilles_results WHERE (achilles_results.analysis_id = ANY (ARRAY[(401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint]))) ar1 JOIN ( SELECT ar.data_source_id, ar.analysis_id, ar.stratum_1 AS concept_id, ar.count_value AS drc FROM achilles_results ar WHERE (ar.analysis_id = ANY (ARRAY[(430)::bigint, (630)::bigint, (730)::bigint, (830)::bigint, (1830)::bigint, (2130)::bigint]))) ar2 ON (((ar1.concept_id = ar2.concept_id) AND (ar1.data_source_id = ar2.data_source_id)))) JOIN data_source source ON ((ar1.data_source_id = source.id))) JOIN concept concept ON ((ar1.concept_id = (concept.concept_id)::text))) ORDER BY ((ar2.drc)::integer) DESC; "],["general-deprecated.html", "9.4 General [Deprecated]", " 9.4 General [Deprecated] CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the Edit Dashboard button can show again. Database Type and Country Filter Figure 9.1: Settings for creating filters charts Theses filter were designed to be used in the dashboard aiming the filtering of the data based on the field database_type and country from the table data_source. For the filters to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query SELECT source.name, country.country, source.database_type, source.acronym FROM public.data_source AS source INNER JOIN public.country AS country ON source.country_id=country.id Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: database_type or country Date Filter: off Instant Filtering: on Total Number of Patients Figure 9.2: Settings for creating the Total Number of Patients chart SQL query SELECT country, database_type, release_date, SUM(count_value) OVER (ORDER BY release_date ASC) FROM achilles_results JOIN data_source ON data_source_id = data_source.id JOIN country ON data_source.country_id = country.id WHERE analysis_id = 1 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Big Number with Trendline Time Time range: No filter Query Metrics: MAX(sum) Series: release_date Breakdowns: source Customize Tab Chart Options Big Number Font Size: Small Subheader Font Size: Tiny Network Growth by Date Figure 9.3: Settings for creating the Network Growth by Date chart SQL query SELECT source.name AS source, country.country, source.database_type, source.release_date, concepts.concept_name AS gender, achilles.count_value as count FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.country AS country ON source.country_id=country.id JOIN ( SELECT &#39;8507&#39; AS concept_id, &#39;Male&#39; AS concept_name UNION SELECT &#39;8532&#39;, &#39;Female&#39; ) AS concepts ON achilles.stratum_1 = concept_id WHERE analysis_id = 2 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(count_value) Series: release_date Breakdowns: source Customize Tab Chart Options Stacked Bars: on Sort Bars: on Extra Controls: on X Axis Reduce X ticks: on Patients per Country Figure 9.4: Settings for creating the Patients per Country chart SQL query {#patientsPerCountryQuery} SELECT country.country, source.database_type, count_value FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.country AS country ON source.country_id=country.id WHERE analysis_id = 1 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(count_value) Series: country Customize Tab Chart Options Legend: off Y Axis Label: N of Patients X Axis X Axis Label: Country Database Types per Country Figure 9.5: Settings for creating the Database Type per Country chart SQL query Same as Patients per Country query Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Heatmap Time Time range: No filter Query X: country Y: database_type Metric: SUM(countr_value) Heatmap Options Left Margin: 75 Show Percentage: off World Map Figure 9.6: Settings for creating the World Map chart SQL query SELECT name, acronym, database_type, latitude, longitude, country FROM public.data_source AS source INNER JOIN public.country AS country ON source.country_id=country.id Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: MapBox Time Time range: No filter Query Longitude: longitude Latitude: latitude Visual Tweaks Map Style: Streets or Light or Outdoors Meta Data Figure 9.7: Settings for creating the Meta Data chart SQL query SELECT acronym, stratum_1 as &quot;name&quot;, database_type, country, stratum_2 as &quot;source_release_date&quot;, stratum_3 as &quot;cdm_release_date&quot;, stratum_4 as &quot;cdm_version&quot;, stratum_5 as &quot;vocabulary_version&quot; FROM achilles_results JOIN data_source ON achilles_results.data_source_id = data_source.id JOIN country ON data_source.country_id = country.id WHERE analysis_id=5000 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Table Time Time range: No filter Query Query Mode: Raw Records Columns: name, source_release_date, cdm_release_date, cdm_version, vocabulary_version "],["person-deprecated.html", "9.5 Person [Deprecated]", " 9.5 Person [Deprecated] Label Colors In order to obtain the colors blue and rose in the chart representing the gender distribution, add the following JSON entry to the JSON object of the JSON Metadata field on the edit dashboard page: &quot;label_colors&quot;: { &quot;Male&quot;: &quot;#3366FF&quot;, &quot;Female&quot;: &quot;#FF3399&quot; } CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the Edit Dashboard button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Age at first observation - Table {#age1ObservationTable} Figure 9.9: Settings for creating the Age at First Observation Table chart SQL query SELECT source.name, source.acronym, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &lt; 10 THEN count_value END) AS &quot;0-10&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 10 AND CAST(stratum_2 AS INTEGER) &lt; 20 THEN count_value END) AS &quot;10-20&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 20 AND CAST(stratum_2 AS INTEGER) &lt; 30 THEN count_value END) AS &quot;20-30&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 30 AND CAST(stratum_2 AS INTEGER) &lt; 40 THEN count_value END) AS &quot;30-40&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 40 AND CAST(stratum_2 AS INTEGER) &lt; 50 THEN count_value END) AS &quot;40-50&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 50 AND CAST(stratum_2 AS INTEGER) &lt; 60 THEN count_value END) AS &quot;50-60&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 60 AND CAST(stratum_2 AS INTEGER) &lt; 70 THEN count_value END) AS &quot;60-70&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 70 AND CAST(stratum_2 AS INTEGER) &lt; 80 THEN count_value END) AS &quot;70-80&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 80 AND CAST(stratum_2 AS INTEGER) &lt; 90 THEN count_value END) AS &quot;80-90&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 90 THEN count_value END) AS &quot;90+&quot; FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id WHERE analysis_id = 102 GROUP BY name, acronym Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Table Time Time range: No filter Query Query Mode: Raw Records Columns: name, 0-10, 10-20, 20-30, 30-40, 40-50, 50-60, 60-70, 70-80, 80-90, 90+ Customize Tab Options Show Cell Bars: off Age at first observation - Bars {#age1ObservationBars} Figure 9.10: Settings for creating the Age at First Observation Bar chart SQL query SELECT source.name, cast(stratum_1 AS int) AS Age, count_value AS count, source.acronym FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 101 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(count) Series: age Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label: Count X Axis X Axis Label: Age Reduce X ticks: on Year of Birth {#yearOfBirth} Figure 9.11: Settings for creating the Year of Birth chart SQL query SELECT source.name, source.acronym, stratum_1 AS &quot;Birth_year&quot;, count_value AS count FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 3 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(count) Series: Birth_year Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label: Count Extra Controls: on X Axis X Axis Label: Year Reduce X ticks: on Gender Figure 9.12: Settings for creating the Gender chart SQL query SELECT source.name, concept_name AS Gender, count_value AS Number_of_persons, source.acronym FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id JOIN ( SELECT &#39;8507&#39; AS concept_id, &#39;Male&#39; AS concept_name UNION SELECT &#39;8532&#39; AS concept_id, &#39;Female&#39; AS concept_name ) AS concepts ON achilles.stratum_1 = concept_id WHERE analysis_id = 2 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(Number_of_persons) Series: acronym Breakdowns: gender Contribution: on Customize Tab Chart Options Stacked Bars: on Sort Bars: on Extra Controls: on X Axis Reduce X ticks: on "],["observation-period-deprecated.html", "9.6 Observation Period [Deprecated]", " 9.6 Observation Period [Deprecated] CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the Edit Dashboard button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Number of Patients in Observation Period {#numInObservationPeriod} The Number of Patients in Observation Period plot shows the number of patients that contribute at least one day in a specific month. Figure 9.13: Settings for creating the Number of Patients in Observation Period chart SQL query SELECT source.name, source.acronym, to_date(stratum_1, &#39;YYYYMM&#39;) as Date, count_value FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 110 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(count_value) with label Num of Patients Series: date Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label: Number of Patients X Axis X Axis Label: Dates Reduce X ticks: on Observation Period Start Dates Figure 9.14: Settings for creating the Observation Period Start Dates chart SQL query SELECT source.name, source.acronym, to_date(stratum_1, &#39;YYYYMM&#39;) AS year_month, count_value FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 111 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(count_value) with label Patients Series: year_month Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label: Number of Patients X Axis X Axis Label: Year Reduce X ticks: on Observation Period End Dates Figure 9.15: Settings for creating the Observation Period End Dates chart SQL query SELECT source.name, source.acronym, to_date(stratum_1, &#39;YYYYMM&#39;) AS year_month, count_value FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 112 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(count_value) with label Patients Series: year_month Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label: Number of Patients X Axis X Axis Label: Year Reduce X ticks: on "],["visit-deprecated.html", "9.7 Visit [Deprecated]", " 9.7 Visit [Deprecated] This dashboard shows the different types of visits per data source (see Visit Occurence Table) CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the Edit Dashboard button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Visit Type Table {#visitTypeTable} Figure 9.16: Settings for creating the Visit Type Table chart SQL query SELECT source.name, source.acronym, concept_name AS &quot;Type&quot;, MAX(count_value) AS &quot;Count&quot; FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id WHERE analysis_id = 201 GROUP BY name, acronym, &quot;Type&quot; ORDER BY &quot;Count&quot; DESC Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Table Time Time range: No filter Query Query Mode: Raw Records Columns: name with label Data Source, Type, Count Visit Types Bars Figure 9.17: Settings for creating the Visit Types bar chart SQL query SELECT source.name, source.acronym, concept_name AS &quot;Observation&quot;, count_value FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id WHERE analysis_id = 201 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(count_value) with label Observations Series: name Breakdowns: Observation Customize Tab Chart Options Stacked Bars: on Sort Bars: on Extra Controls: on X Axis X Axis Label: Databases Reduce X ticks: on "],["death-deprecated.html", "9.8 Death [Deprecated]", " 9.8 Death [Deprecated] CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the Edit Dashboard button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Number of Records Figure 9.18: Settings for creating the Number of Records chart SQL query SELECT source.name, count_value, source.acronym FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 501 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(count_value) with label Count Series: name Customize Tab Chart Options Y Axis Label: Number of Patients X Axis X Axis Label: Databases Reduce X ticks: on Death By Year per Thousand People Figure 9.19: Settings for creating the Death by Year per Thousand People chart SQL query SELECT source.name, source.acronym, EXTRACT(year FROM TO_DATE(stratum_1, &#39;YYYYMM&#39;)) AS Date, count_value FROM public.achilles_results as achilles INNER JOIN public.data_source as source ON achilles.data_source_id=source.id WHERE analysis_id = 502 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(count_value) with label Count Series: date Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label:Number of Patients (in thousands) X Axis X Axis Label: Years Reduce X ticks: on "],["concepts-browser-deprecated.html", "9.9 Concepts Browser [Deprecated]", " 9.9 Concepts Browser [Deprecated] The concepts browser allows you to search for concepts by name or concept_id in all the data sources you select. No exact number of patients or occurrences are provided but the magnitude of both. CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the Edit Dashboard button can show again. Data Source and Domain Filters Figure 9.1: Settings for creating the Data Source and Domain filter charts For the filters to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query SELECT concept_name, domain_id, source.name AS source_name, source.acronym FROM achilles_results JOIN concept ON cast(stratum_1 AS BIGINT) = concept_id INNER JOIN public.data_source AS source ON data_source_id=source.id WHERE analysis_id in (201, 401, 601, 701, 801, 901, 1001, 1801, 200, 400, 600, 700, 800, 1800) Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: source_name or domain_id Date Filter: off Instant Filtering: on Number of Concepts Figure 9.20: Settings for creating the Number of Concepts chart SQL Query Same as Data Source and Domain filters query Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Big Number Time Time range: No filter Query Metric: COUNT_DISTINCT(concept_name) with label Concepts Customize Tab Big Number Font Size: Small Subheader Font Size: Tiny Concept Browser Table {#conceptBrowserTable} Figure 9.21: Settings for creating the Concepts Table chart SELECT q1.concept_id AS concept_id, q1.concept_name AS concept_name, q1.domain_id, source.name AS source_name, source.acronym, sum(q1.count_value) as &quot;Occurrence_count&quot;, sum(q1.count_person) as &quot;Person_count&quot;, CASE WHEN sum(q1.count_value)&lt;=10 THEN &#39;&lt;=10&#39; WHEN sum(q1.count_value)&lt;=100 THEN &#39;11-102&#39; WHEN sum(q1.count_value)&lt;=1000 THEN &#39;102-103&#39; WHEN sum(q1.count_value)&lt;=10000 THEN &#39;103-104&#39; WHEN sum(q1.count_value)&lt;=100000 THEN &#39;104-105&#39; WHEN sum(q1.count_value)&lt;=1000000 THEN &#39;105-106&#39; ELSE &#39;&gt;106&#39; END as &quot;magnitude_occurrences&quot;, CASE WHEN sum(q1.count_person)&lt;=10 THEN &#39;&lt;=10&#39; WHEN sum(q1.count_person)&lt;=100 THEN &#39;11-102&#39; WHEN sum(q1.count_person)&lt;=1000 THEN &#39;102-103&#39; WHEN sum(q1.count_person)&lt;=10000 THEN &#39;103-104&#39; WHEN sum(q1.count_person)&lt;=100000 THEN &#39;104-105&#39; WHEN sum(q1.count_person)&lt;=1000000 THEN &#39;105-106&#39; ELSE &#39;&gt;106&#39; END AS &quot;magnitude_persons&quot; FROM (SELECT analysis_id, stratum_1 concept_id, data_source_id, concept_name, domain_id, count_value, 0 as count_person FROM achilles_results JOIN concept ON cast(stratum_1 AS BIGINT)=concept_id WHERE analysis_id in (201, 301, 401, 601, 701, 801, 901, 1001, 1801) UNION (SELECT analysis_id, stratum_1 concept_id, data_source_id, concept_name, domain_id, 0 as count_value, sum(count_value) as count_person FROM achilles_results JOIN concept on cast(stratum_1 as BIGINT)=concept_id WHERE analysis_id in (202, 401, 601, 701, 801, 901, 1001, 1801) GROUP BY analysis_id,stratum_1,data_source_id,concept_name,domain_id) ) as q1 INNER JOIN public.data_source AS source ON q1.data_source_id=source.id GROUP BY q1.concept_id,q1.concept_name,q1.domain_id,source.name, acronym ORDER BY &quot;Person_count&quot; desc Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Table Time Time range: No filter Query Query Mode: Raw Records Columns: source_name, concept_id, concept_name, domain_id, magnitude_persons, magnitude_occurrences Customize Tab Options Table Timestamps Format: %Y-%m-%d %H:%M:%S | 2019-01-14 01:32:10 Page Length: 50 Search Box: on Emit Filter Events: on "],["provenance-deprecated.html", "9.10 Provenance [Deprecated]", " 9.10 Provenance [Deprecated] This Dashboard shows the provenance of the data in the different data domains. CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the Edit Dashboard button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Condition &amp; Drug &amp; Procedure &amp; Device &amp; Measurement &amp; Observation Types {#dataProvenanceCharts} Figure 9.22: Settings for creating the Condition, Drug, Procedure, Device, Measurement and Observation charts SQL query All 6 charts use the same sql query. SELECT source.name, source.acronym, CASE WHEN analysis_id = 405 THEN &#39;Condition&#39; WHEN analysis_id = 605 THEN &#39;Procedure&#39; WHEN analysis_id = 705 THEN &#39;Drug&#39; WHEN analysis_id = 805 THEN &#39;Observation&#39; WHEN analysis_id = 1805 THEN &#39;Measurement&#39; WHEN analysis_id = 2105 THEN &#39;Device&#39; ELSE &#39;Other&#39; END AS domain_name, concept_name, SUM(count_value) AS num_records FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.concept AS c1 ON CAST(stratum_2 AS BIGINT) = concept_id WHERE analysis_id IN (405,605,705,805,1805,2105) GROUP BY source.name, source.acronym, concept_name, CASE WHEN analysis_id = 405 THEN &#39;Condition&#39; WHEN analysis_id = 605 THEN &#39;Procedure&#39; WHEN analysis_id = 705 THEN &#39;Drug&#39; WHEN analysis_id = 805 THEN &#39;Observation&#39; WHEN analysis_id = 1805 THEN &#39;Measurement&#39; WHEN analysis_id = 2105 THEN &#39;Device&#39; ELSE &#39;Other&#39; END Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(num_records) with label Nr Records Filters: domain_name=Condition or domain_name=Drug or domain_name=Procedure or domain_name=Device or domain_name=Measurement or domain_name=Observation Series: name Breakdowns: concept_name Contribution: on Customize Tab Chart Options Stacked Bars: on "],["data-domains-deprecated.html", "9.11 Data Domains [Deprecated]", " 9.11 Data Domains [Deprecated] CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the Edit Dashboard button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Average Number of Records per Person {#avgRecordsPerPerson} Figure 9.23: Settings for creating the Data Source filter chart SQL query SELECT source.name, source.acronym, CASE WHEN analysis_id = 201 THEN &#39;Visit&#39; WHEN analysis_id = 401 THEN &#39;Condition&#39; WHEN analysis_id = 501 THEN &#39;Death&#39; WHEN analysis_id = 601 THEN &#39;Procedure&#39; WHEN analysis_id = 701 THEN &#39;Drug Exposure&#39; WHEN analysis_id = 801 THEN &#39;Observation&#39; WHEN analysis_id = 1801 THEN &#39;Measurement&#39; WHEN analysis_id = 2101 THEN &#39;Device&#39; WHEN analysis_id = 2201 THEN &#39;Note&#39; END AS Data_Domain, SUM(count_value) /AVG(num_persons) AS &quot;records_per_person&quot; FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN ( SELECT data_source_id , count_value as num_persons FROM achilles_results WHERE analysis_id = 1) counts ON achilles.data_source_id = counts.data_source_id GROUP BY analysis_id, source.name, source.acronym HAVING analysis_id IN (201, 401, 501, 601, 701, 801, 1801, 2101, 2201) Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Heatmap Time Time range: No filter Query X: name Y: data_domain Metric: AVG(records_per_person) with a label avg records per person Row limit: None Heatmap Options Left Margin: 100 Show Percentage: off "],["404.html", "Page not found", " Page not found The page you requested cannot be found (perhaps it was moved or renamed). You may want to try searching to find the page's new location, or use the table of contents to find the page you are looking for. "]]
+[["index.html", "Data Network Dashboards Chapter 1 Preface", " Data Network Dashboards This document is currently under construction 2022-06-18 Chapter 1 Preface Automated Characterization of Health Information at Large-scale Longitudinal Evidence Systems (ACHILLES) is a profiling tool developed by the OHDSI community to provide descriptive statistics of databases standardized to the OMOP Common Data Model. These characteristics are presented graphically in the ATLAS tool. However, this solution does not allow for database comparison across the data network. The Data Network Dashboards aggregates ACHILLES results files from databases in the network and displays the descriptive statistics through graphical dashboards. This tool is helpful to gain insight in the growth of the data network and is useful for the selection of databases for specific research questions. In the software demonstration we show a first version of this tool that will be further developed in EHDEN in close collaboration with all our stakeholders, including OHDSI. Contributors To develop this tool, EHDEN organized a hack-a-thon (Aveiro, December 2-3, 2019), where we defined and implemented a series of charts and dashboards containing the most relevant information about the OMOP CDM databases. The team involved in this task were composed by the following members: João Rafael Almeida1 André Pedrosa1 Peter R. Rijnbeek2 Marcel de Wilde2 Michel Van Speybroeck3 Maxim Moinat4 Pedro Freire1 Alina Trifan1 Sérgio Matos1 José Luís Oliveira1 1 - Institute of Electronics and Informatics Engineering of Aveiro, Department of Electronics and Telecommunication, University of Aveiro, Aveiro, Portugal 2 - Erasmus MC, Rotterdam, Netherlands 3 - Janssen Pharmaceutica NV, Beerse, Belgium 4 - The Hyve, Utrecht, Netherlands Considerations This manual was written to be a guide for a clean installation of this system with all the dashboards that we defined during the project. The first chapter describes the goal of the system and the second how to install the system. The remaining chapters are dedicated to the dashboards, in which chapters describes one dashboard and all its charts. To simplify the representation of the dashboard’s layout, we used similar schemas as it is presented in Figure 1.1. The white box is the dashboard and the inside boxes are charts. The colour changes in relation to the type of chart. Figure 1.1: Example of a dashboards tool presenting the databases available in the network (simulated data) License The system is open-source and this manual was written in RMarkdown using the bookdown package. Acknowledges This work has been conducted in the context of EHDEN, a project that receives funding from the European Union’s Horizon 2020 and EFPIA through IMI2 Joint Undertaking initiative, under grant agreement No 806968. "],["introduction.html", "Chapter 2 Introduction", " Chapter 2 Introduction The OHDSI research network has been growing steadily which results in an increasing number of healthcare databases standardized to the OMOP CDM format. The OHDSI community created the ACHILLES tool (Automated Characterization of Health Information at Large-scale Longitudinal Exploration System) to characterize those databases. The results are available to the data custodian in their local ATLAS tool and helps them to gain insights in their data and helps in assessing the feasibility of a particular research questions. ACHILLES was designed to extract the metadata from a single database, which by itself does not allow the comparison with the remaining databases in the network. However, we believe there is even more value in sharing this information with others to enable network research in a Data Network Dashboard. Data Network Dashboard The European Health Data and Evidence Network (EHDEN) project therefore designed a Data Network Dashboard tool, a web application to aggregate information from distributed OMOP CDM databases. It uses the ACHILLES results files to construct graphical dashboards and enables database comparison (Figure 2.1). The tool is built on Apache Superset, which is an open-source enterprise-ready business intelligence web application that can provide powerful and fully customizable graphical representations of data. Achilles results can be uploaded through the EHDEN Database Catalogue using the dashboards plugin but can also be directly uploaded in the tool. Figure 1. Example of a dashboards tool presenting age and gender distributions (simulated data). Figure 2.1: Example of a dashboards tool presenting the databases available in the network (simulated data) In this tools, we defined and implemented a series of charts and dashboards containing the most relevant information about the databases, such as: General: dashboards that shows the databases types per country, the distribution of data source types, the growth of the Network including the number of database and the number of patients in the databases over time; Person: representing the number of patients per country, age distribution at first observation, year of birth distribution and normalized gender distribution; Population characteristics: dashboard with the cumulative patient time, persons with continuous observation per month, and the start and end dates of those periods; Visit: chart to compare the number and type of visit occurrence records; Death: information about the number of death records by month, and the patient age at time of death; Concepts: bubble chart which shows the number of patients and records per concept over the databases; Data domains: heat map visualization of the major data domains in each database. "],["installation.html", "Chapter 3 Installation", " Chapter 3 Installation Currently, we use docker to deploy our environment First Steps Clone the repository with the command git clone --recurse-submodules https://github.com/EHDEN/NetworkDashboards. If you already cloned the repository without the --recurse-submodules option, run git submodule update --init to fetch the superset submodule. Create a .env file on the docker directory, using .env-example as a reference, setting all necessary environment variables (SUPERSET_MAPBOX_API_KEY and DASHBOARD_VIEWER_SECRET_KEY). 2.1 If you will use this application as a third-party application and will iframe it, set the variable SINGLE_APPLICATION_MODE to False and define the host of the main application on the variable MAIN_APPLICATION_HOST. Also make sure to add this last host to the list of ALLOWED_HOSTS. Dashboard Viewer setup If you wish to expose the dashboard viewer app through a specific domain(s) you must add it/them to the ALLOWED_HOSTS list on file dashboard_viewer/dashboard_viewer/settings.py and remove the '*' entry. Build containers’ images: docker-compose build. This might take several minutes. Set up the database and create an admin account for the dashboard viewer app: docker-compose run --rm dashboard ./docker-init.sh. Insert Concepts The concepts table is not in the repository due to its dimension, therefore we use directly the Postgres console to insert this table in the installation. Get your concept csv file from Athena Copy the file into postgres container docker cp concept.csv dashboard_viewer_postgres_1:/tmp/ Enter in the postgres container: docker exec -it dashboard_viewer_postgres_1 bash Enter in the achilles database (value of the variable POSTGRES_ACHILLES_DB on the .env file) with the root user (value of the variable POSTGRES_ROOT_USER on the .env file): psql achilles root Create the concept table CREATE TABLE concept ( concept_id INTEGER NOT NULL, concept_name VARCHAR(255) NOT NULL, domain_id VARCHAR(20) NOT NULL, vocabulary_id VARCHAR(20) NOT NULL, concept_class_id VARCHAR(20) NOT NULL, standard_concept VARCHAR(1) NULL, concept_code VARCHAR(50) NOT NULL, valid_start_date DATE NOT NULL, valid_end_date DATE NOT NULL, invalid_reason VARCHAR(1) NULL ); Copy the CSV file content to the table (this could take a while) To get both ' (single quotes) and \" (double quotes) on the concept_name column we use a workaround by setting the quote character to one that should never be in the text. Here we used \\b (backslash). COPY public.concept FROM &#39;/tmp/concept.csv&#39; WITH CSV HEADER DELIMITER E&#39;\\t&#39; QUOTE E&#39;\\b&#39;; Create index in table (this could take a while): CREATE INDEX concept_concept_id_index ON concept (concept_id); CREATE INDEX concept_concept_name_index ON concept (concept_name); Set the owner of the concept table to the achilles user (value of the variable POSTGRES_ACHILLES_USER on the .env file): ALTER TABLE concept OWNER TO achiller Bring up the containers: docker-compose up -d. Run the command docker-compose run --rm dashboard python manage.py generate_materialized_views to create the materialized views on Postgres. Superset setup Bring up the containers: docker-compose up -d. Make sure that the container superset-init has finished before continuing. It is creating the necessary tables on the database and creating permissions and roles. If you used the default ports: Go to http://localhost to access the dashboard viewer app. Go to http://localhost:8088 to access superset. By default Superset’s admin user credentials are admin/admin. It is recommended that you change the password if you will use this in a production environment. To any anonymous user view dashboards, add the following permissions to the public role: all datasource access on all_datasource_access can csrf token on Superset can dashboard on Superset can explore json on Superset can read on Chart can read on CssTemplate can read on Dashboard For each dashboard you want anonymous users to be able to access, on the dashboard list page click edit (the pencil on the right) and add the “Admin” and “Public” roles to the “Roles with acess” field. Dummy data On a fresh installation, there are no achilles_results data so Superset’s dashboards will display “No results”. On the root of this repository, you can find the demo directory where we have an ACHILLES results file with synthetic data that you can upload to a data source on the uploader app of the dashboard viewer (http://localhost/uploader). If you wish to compare multiple data sources, on the demo directory there is also a python script that allows you to generate new ACHILLES results files, where it generates random count values based on the ranges of values for each set of analysis_id and stratums present on a base ACHILLES results file. So, from the one ACHILLES results fill we provided, you can have multiple data sources with different data. "],["processes.html", "Chapter 4 Processes", " Chapter 4 Processes Data Sources Target: platform user Before uploading any data to this platform, a data source owner has to create a data source instance to then associated the upload data with. The creation of data source is done through the [BASE_URL]/uploader/ URL, where 7 fields are expected: name: an extensive name acronym: a short name country: where is the data source localized link (Optional): web page of the data source database type: type of OMOP database coordinates: a more accurate representation of the data source’s localization hash (Optional): the internal unique identifier of a data source If you access [BASE_URL]/uploader/ the 7th field (hash) is set automatically for something random, however, if you want to set it use the [BASE_URL]/uploader/[HASH]/ URL. To avoid duplication on the database type field, this field is transformed (use title case and trimmed) and then is checked there is already a record (Database Type) with the same value. There are several ways to create a data source: Create through a web form By accessing the [BASE_URL]/uploader/ URL, you will get a form where you can field the fields, where the country field is a dropdown and the coordinates field is set through a map widget. Automatically create when performing a GET to the [BASE_URL]/uploader/ URL If the Network Dashboards platform is being used as a third-party application and the main application has all the data for the required fields, the data source can be automatically created and the user is redirected directly to the upload files page. To perform this, each field should be provided as a URL parameter when accessing the [BASE_URL]/uploader/ URL. If all required fields are provided and are valid the data source is created and the user is redirected to the upload files page. If a required field is missing or is not valid the webform is presented to the user so it can manually fill those fields. Automatically create by performing a POST to the [BASE_URL]/uploader/ URL Since the creation URL does not have csrf cookie protection, you can perform a POST request as you were submitting a form. Notes For the automatic options: Since the coordinates field is composed of two fields (latitude, longitude), it should be submitted as coordinates_0=[latitude] and coordinates_1=[longitude] The country field should match one of the available on the dropdown of the webform. Draft Status After a data owner uploads data into his data source, he might not want to make it public right away. To achieve this a data source has a boolean field telling whether if the data source is in draft mode. This then also allows creating dashboards with data of non-draft data sources only. There are three ways to change the value of this draft status field: Through the Django admin app ([BASE_URL]/admin/) Accessing the respective edit page of the data source. This requires a feature to be enabled, which is more detailed on the Allow Draft Status Updates section of the Customization chapter. Perform a PATCH request to the [BASE_URL]/uploader/[HASH]/ URL. On this request, other fields, other than the draft status, can be changed. The body of the request must be a JSON object with the fields that will suffer changes and their new values. Catalogue Results Files Target: platform user Once a data source is created you can access its upload page by accessing the [BASE_URL]/uploader/[HASH]/. If no data source has the provided hash you will be redirected back to the data source creation form. On the upload page you can: Go to the edit page of your data source Upload a catalogue results file Check the upload history A catalogue results file is a CSV file, the result obtained after running the EHDEN/CatalogueExport R package on an OMOP database. It is a variant of the OHDSI/Achilles where it only extracts a subset of analyses of the ACHILLES’ original set. The upload form expects a CSV file with the following columns: Name Type Required/Non-Nullable/Non-Empty analysis_id int Yes stratum_1 string No stratum_2 string No stratum_3 string No stratum_4 string No stratum_5 string No count_value int Yes min_value double No max_value double No avg_value double No stdev_value double No median_value double No p10_value double No p25_value double No p75_value double No p90_value double No The uploaded file must: either contain the first 7 columns OR all 16 columns contain the columns in the same order as presented in the table above While parsing the uploaded file, some data is extracted to then present on the Upload history and to update data source information. This data is extracted from the record with analysis id 0, which is required to be present on the file, and 5000, which is optional. Next is presented the data extracted and their description: R Package Version: the version of CatalogueExport R package used Generation Date: date at which the CatalogueExport was executed on the OMOP database Source Release Date: date at which the OMOP database was released CDM Release Date: date at which the used CDM version was released CDM Version: version of the CDM used Vocabulary Version: version of the vocabulary used The next table is presented where the previous data is stored on the rows with analysis id 0 and 5000: Analysis Id Stratum 1 Stratum 2 Stratum 3 Stratum 4 Stratum 5 0 R Package Version Generation Date 5000 Source Release Date CDM Release Date CDM Version Vocabulary Version Materialized Views Target: admin user For each chart, Superset has an underlying SQL query which in our case is run every time a chart is rendered. If one of these queries takes too long to execute the charts will also take too long until they are rendered and eventually users might get timeout messages given a bad user experience. To avoid this problem, instead of executing the raw SQL query we create a postgres materialized view of the query, which is then used to feed the data to the chart. So only a simple SELECT x FROM x query is executed when a chart is rendered. So whenever I create a chart I have to access the Postgres console? No, we created an unmanaged Materialized Queries model that maps to the materialized views on Postgres. With it you can create new materialized views through the Django admin app, by accessing the [BASE_URL]/admin/ URL. You have to provide the materialized view name and its query, which will then be used to execute the query CREATE MATERIALIZED VIEW [name] AS [query], which will be executed on a background task so the browser doesn’t hang and times out, in case of complicated queries. Taking this into account, the record associated will not appear on the Django admin app until the CREATE MATERIALIZED VIEW query finishes. To give feedback on the background task we use celery/django-celery-results, so you can check the status of a task on the Task Results model of the Celery Results app After the creation of a Materialized Query, the will be a message telling the id of the task which is executing the CREATE MATERIALIZED VIEW query. You can then check for the record associated with the task, click on the id to get more details. If something went wrong check the error message either on Result Data or Traceback fields under the Result section After all this, the final step is to add the materialized view as a Dataset. Login into Superset, then go to Data -&gt; Datasets and create a new one. Select the Achilles database, the public schema, then the created materialized view and click “ADD”. After this, the materialized view can be used as a data source for a new chart. Tabs View [Deprecated] Note: This app is no longer maintaned and the associated urls were unlinked. Target: admin user Once there are data sources on the platform, data was uploaded to them and there are dashboards created on Superset, researchers can now browse through the dashboards and analyze and compare the data of the different data sources. One way to allow this would be to let them browse through the dashboard list on Superset. However, if there was some dashboards not ready to show to the public users, they could still access them. For that, it was created a page, with a sidebar, where public users could browse through the available and ready dashboards. It can be accessed through the URL [BASE_URL]/tabs/ The sidebar entries can be configured through the Django admin app, accessing the Tabsmanager app section. Here two models are available to create: Tab Groups: They allow to groups several sidebar entries within a collapsable group. Tabs: Will create a clickable entry on the sidebar that can be presented within a group. When a tab is clicked the associated dashboard will be displayed on the page. Each entry, tab, or group of them, expects: Title/Name Icon: Name of a font awesome version 5 icon Position: Allows to order entries along the sidebar. If a Tab has a group, then this field will order the tabs within that group only. Visible: If whether or not this tab or group should be visible. The goal of this field is to avoid having to delete the record from the database just because a certain tab is not ready and later on created it from scratch. Tabs additionally expect an URL, which will be used to display a Superset dashboard in an iframe. To hide Superset’s menu bar, an additional standalone URL parameter should be appended to the provided URL of a tab. The value of the standalone arguments depends on the expected result: 1: menu bar is hidden. the bar where the dashboard title, publish status, and three dots option menu are present will still appear 2: both the menu bar and the dashboard title bar are hidden. By default, the dashboard of the first tab is displayed on the page, however, if one wants a specific tab to be displayed when the page is opened, its title should be present in the hash part of the URL. For example, if there is a tab called People, to make that tab selected at the start the following URL should be used [BASE_URL]/tabs/#People. "],["backups.html", "Chapter 5 Backups", " Chapter 5 Backups Create a credentials file (the structure of the file depends on the target cloud server) Create a backups.conf under the backups directory using backups.conf.example as base, setting the appropriate value for the several variables. For variables associated with files and directories always use absolute paths. Variables: RUN: Set it to 0 if you don’t want the next scheduled backup to run. This variable allows you to cancel any backup runs while you are doing some maintenance on the application. CONSTANCE_REDIS_DB: Number of the Redis database where the django constance config is stored. The default value is 2. This value should be the same as the environment variable REDIS_CONSTANCE_DB of the dashboard container. The following variables are associated with the arguemtns of the backup_uploader python package. Check its usage for more details: APP_NAME: The backup process will generate some directories with this name in places that are shared with other applications. SERVER: The name of the target cloud server to where backups should be uploaded (dropbox or mega). BACKUP_CHAIN_CONFIG: Allows having different directories with backups of different ages. CREDENTIALS_FILE_PATH: File containing the credentials to access the server to upload the backup file. Install the backup_uploader python package by following its install instructions. Schedule your backups * * * * * Command_to_execute | | | | | | | | | Day of the Week ( 0 - 6 ) ( Sunday = 0 ) | | | | | | | Month ( 1 - 12 ) | | | | | Day of Month ( 1 - 31 ) | | | Hour ( 0 - 23 ) | Min ( 0 - 59 ) (Retrived from: Tutorialspoint) Ex: To run every day at 3:00 am crontab -e Add entry 0 3 * * * $HOME/NetworkDashboards/backups/backup.sh (The path to the backup script might be different) Restore Select the compressed backup you want to restore. Make sure that all the environment variables are the same as the ones that were used for the chosen backup file. Additionally, the backups.conf file is also necessary to set up, since the TMP_DIRECTORY variable will be used. Run the backups/restore.sh script. Useful stuff How to create a shared link to a dropbox directory using its python’s API: pip install dropbox import dropbox d = dropbox.Dropbox(API_TOKEN) # create a shared link for a directory from dropbox.sharing import SharedLinkSettings sharing_settings = SharedLinkSettings( require_password=True, link_password=DIRECTORY_PASSWORD, ) d.sharing_create_shared_link_with_settings( DIRECTORY_PATH, sharing_settings, ) # get all links for link in d.sharing_get_shared_links().links: print(f&quot;{link.path} -&gt; {link.url}&quot;) "],["customizations.html", "Chapter 6 Customizations", " Chapter 6 Customizations This platform is currently being used within the scope of the European Health Data &amp; Evidence Network (EHDEN) project. To allow the dashboard viewer Django application to be easily used by another project or company, several components support customization in runtime, removing the need to change such things directly on the source code. To achieve this we make use of Constance that allows configuring several fields which then can be changed through the Django admin app. Platform Logo It is visible both in the Tabs Manager and the Catalogue Results Uploader URLs. The platform allows two possible ways to choose a logo: upload a file or provide an URL to an image. If both fields are provided, the URL one will be used. On the tabs manager app, we also allow customization of the CSS associated both with the image itself and its container. Platform Title All pages of the uploader app use the same base HTML file which contains a header with the platform logo, page title, and platform title. The first was already mentioned before, the second can’t be changed. The last can be altered using a Constance field. Uploader Page Texts The data source creation page has three columns with some text providing some instructions for the creation of a data source and the upload of catalogue results. The text of these three columns is customizable, where markdown can be used, which is then transformed into HTML before rending the page. Allow Draft Status Updates In the section Draft Status of the Processes chapter, it was already explained the concept around draft data sources. By default, a user can NOT change the data source status on the edit page of a data source, only being allowed to do it through a PATCH request. Changes through the web edit form can be allowed by changing a Constance field. Them an additional draft field will be available on the edit data source form. "],["development-instructions.html", "Chapter 7 Development Instructions", " Chapter 7 Development Instructions Repository Structure Description backups: Scripts and configuration files to perform backups of all the data involved in the Network Dashboards applications (Dashboard viewer + Superset) dashboard_viewer: The Dashboard Viewer Django application to manage and upload catalogue results data. More detail can be found in the Code Documentation chapter. demo: Files that can be used to test some processes of the platform (Upload catalogue results data and import a simple dashboard) docker: Docker-compose stack-related directories. Environment file Configuration directories (Nginx and Postgres) Custom Superest Dockerfile For more information about docker deployment consult the Installation chapter. docs: Where the files of this gitbook are hosted. Other output formats can also be obtained here. Consult the Documentation section of this chapter for more details. superset: contains a submodule to the latest supported version of Superset’s repository and our custom chart plugins tests: contains files to launch a docker-compose stack specific to run tests. requirements-dev: python requirements files to the several tools to either perform code style checks or to run Django tests .pre-commit-config.yaml: configuration for the pre-commit tool. This is not mandatory to use but is a good tool to automatically fix problems related to code style on staged files setup.cfg: configurations for the several code style tools tox.ini: configuration for the tox tool. It helps automate the process to check if the code style is correct and if the Django tests are passing It’s extremely useful in this context since different code style check tools that we use have some conflicts with python dependencies. It creates a virtual environment for each tox environment, in our case, for each code style check tool plus Django tests Superset Currently, we have made some modifications to the box plot visualization on our superset installation which doesn’t allow us to use superset’s pre-built images available on their docker hub, since we have to call npm’s build procedures on the front-end code. To build our custom docker image we used superset’s Dockerfile as a base, where we removed the Dev section and added some code to install our chart plugins before building the front-end code. The changes made to the Dockerfile to install the chart plugins are in this area: L46: Repalce some boxplot fiels with ours; L47: Superset’s original version of the controlPanel.ts file is a .ts versions however ours is a .tsx. For that, we have to remove the .ts version to properly override this file. Update Superset cd into superset’s submodule directory. Get the latest tags: git fetch -t. Checkout to the new desired release tag. Check if there are any changes made to superset’s Dockerfile (on the root of the repository for the current latest release), adapt them, and insert them on our custom Dockerfile under the docker/superset directory. If the version of the plugin package plugin-chart-echarts changed, it’s necessary to update our box plot plugin. If it is greater than 0.18.25, go to the history (https://github.com/apache/superset/commits/[RELEASE-TAG]/superset-frontend/plugins/plugin-chart-echarts) of commits done to the plugin-chart-echarts plugin update to the most recent commit, applying their changes to the files in the superset/box-plot-overrides directory. A fast way check the changes done between two commits: git diff [old_commit_hash] [recent_commit_hash] -- superset-frontend/plugins/plugin-chart-echarts Chart Plugin Development Follow the instructions of this tutorial to create the necessary base files of your plugin. To deploy you can either use the DYNAMIC_PLUGINS feature flag or you can add and build your plugins in superset/Dockerfile. Important features Standalone Mode: by appending ?standalone=true to the URL of a dashboard superset’s menu bar won’t show. New versions support ?standalone=1 or ?standalone=2 where the first does the same as ?standalone=true and the second also hides the bar containing the name of the dashboard, leaving just the charts. Filters: check this faq entry Append ?preselect_filters={\"chartId\":{\"columnToFilterBy\":[\"value1\", \"value2\"]}} to the dashboard URL to apply a filter once the dashboard is loaded. E.g. ?preselect_filters={\"13\":{\"name\":[\"Demo University of Aveiro\"]}} Custom label colors: check this faq entry Github Actions Github has a feature that allows performing automatic actions after a certain event happens on the repository. We use this feature to execute to check if everything is alright with new PR before merging them to dev. Github calls a job a set of steps that are executed after a certain event. Then several jobs can be groups in workflows. Events are defined at the workflow level, so all the jobs in a workflow will execute at the same time. We have two workflows: Code analysis checks Django tests The first has three jobs black: ensures that python’s code format is consistent throughout the project isort: sorts and organizes import statements prospector: executes a set of tools that perform some code analysis The second has just one job that executes the Django tests. Both workflows execute on commits of pull requests that will be merged into the dev branch. Regarding the code analysis workflow, the three tools used have requirements that conflict with each other, for that there is a requirements file for each tool on the requirement-dev directory of the repository. To avoid having three different virtual environments for each tool, you can use the tox. You just need to install the development requirements (pip install -r requirements-dev/requirements-dev.txt) and then just run tox. It will manage the necessary virtual environments and install the requirements for each tool. If you, however, want to run a specific tool manually you can check the tox configuration file (tox.ini). For example for the prospector tool the tox configuration is the following: [testenv:prospector] basepython = python3.8 deps = -r{toxinidir}/requirements-dev/requirements-prospector.txt -r{toxinidir}/dashboard_viewer/requirements.txt commands = prospector dashboard_viewer prospector docker/superset we can see that it installs the requirement for the prospector tool and also the requirements of the Dashboard Viewer Django app and then runs two commands. For both black and isort tools, when you run tox, it will show the necessary changes that are required to make the code good. You can apply the changes automatically by executing the tools manually without the --check and --check-only options respectively. Sometimes prospector can be a pain in the boot, complaining about too much stuff. You can make prospector ignore some bad stuff by adding the comment, # noqa, to the end of the specific line where it is complaining. Tests Our tests use Django’s building testing features, which uses unittest under the hood. Not all featured have tests associated, however, there are already some tests scenarios in mind written as issues on the repository, which have the tag Test Use Case. To run the tests we set up a docker-compose stack, under the test directory which has just the necessary data containers (Redis and Postgres) to avoid having to make changes on the development/production docker-compose stack. Once the stack is up it only necessary to run SECRET_KEY=secret python manage.py test to execute the tests. If you are developing any tests that involve celery, there is no need to have a celery process running, since on Django’s settings.py we set the test runner to the celery one. This way the python manage.py test is enough to test the whole application. Python Requirements The python requirements for the Dashboard Viewer Django app are present on the requirements.txt file of the dashboard_viewer directory. The file is divided into two sections. First are the direct dependencies. Dependencies that are directly used or imported by the Dashboard Viewer Django app. For better maintainability, every direct dependency has a small description in front of it, so any developer knows why it is being mentioned in the requirements file. The second part of the file contains the indirect dependencies. Basically dependencies of our direct dependencies. After any update is made to the direct dependencies the following procedure should be followed: Create a new virtual environment just for the dependencies of this file Delete the indirect dependencies section of the file Install all the direct dependencies pip install -r requirements.txt Append the result of pip’s freeze to the requirements file pip freeze &gt;&gt; requirements.txt Remove from the second section of the file, duplicated entries of the first section of the file, in other words, remove from the indirect dependencies section the direct dependencies. With #185 we intend to start using the pip-compile tool. With it, we can have a file with the direct dependencies (requirements.in), and then pip-compile reads that file and automatically creates a requirements.txt file with all the dependencies and which package requires that specific dependency. The update process of dependencies will then just be Install the pip-compile tool pip install pip-tools Make the change to the direct dependencies on the requirements.in file (No need for a virtual environment) Call the pip-compile tool on the requirement.in file pip-compile requirements.in Documentation The plan is to have all the documentation on this git book and any other places that might require some description/information should point to this GitBook so we maintain a commonplace for all the documentation. This way we can make sure that the code and the documentation are in the same place since on a pull request for a specific feature or a bug fix, associated documentation should also be changed with it. The manual was written in RMarkdown using the bookdown package. All the code is stored in the docs/src directory as well as the script to build all the documentation. Do not change the files in the root of the docs directory, because those files will be removed during the build processed and replaced by the new ones. Therefore, to update this documentation, apply the changes to the files in the directory docs/src. To build the documentation, you need to have R installed, and if you are using UNIX-based systems, you only need to run sh _build.sh in the docs/src directory. In this documentation, we also describe all the settings around the dashboards that are used on the EHDEN project. To avoid an extensive table of contents and also to avoid having a big chapter page for dashboards, we configured this GitBook to split different sections into different pages. A section on the GitBook is mapped to markdown headings elements of level 2 (H2 or ##). This is, however, inconvenient for small chapters like the preface (index.Rmd). To make it render all the sections on the same page, instead of using headings of level 2 (##) you should use level 3 (###). Although this will make the section numeration start at 0, e.g 1.0.1, 1.0.2, … To avoid this we appended {-} to the sections titles so that the numeration does not show. If a new file is created with more documentation, its name should be placed, including extension, in the desired location in this list of the docks/src/_bookdown.yml file. "],["code-documentation.html", "Chapter 8 Code Documentation", " Chapter 8 Code Documentation Apps Materialized Queries Manager Models This app has only one model, MaterializedQuery, which maps to a Postgres materialized view. To avoid having to maintain the consistency between both the records of this Django app and the Postgres materialized views: the managed Meta flag was set to False to avoid Django creating migrations to the model the db_table Meta flag was set to the name of the table where Postgres stores the information about the existing materialized views (pg_matviews). the fields of the model, matviewname and definition, use the same name and type as the ones of the pg_matviews Postgres table. Views This app has no view exposed since all operations to the MaterializedQuery models are expected to be performed in the Django admin app. However, we had to change Django’s default behaviors for the create, update and delete operations of the model. For the delete operation, we overrode the delete method of the MaterializedQuery Django model to just execute a DROP MATERIALIZED VIEW SQL statement. Related to creation and update we had to change some internal methods of Django’s admin app ModelAdmin base class. _changeform_view: where Model records were being created. Instead, CREATE MATERIALIZED VIEW and ALTER MATERIALIZED VIEW SQL statements are executed. However, since some materialized views might take some time to build, create a record like this could lead to a browser timeout. We then decided to execute these statements in a celery background task. The main changes were made here where we launch the background task. response_add: Since the materialized view might not be created the right way, saying “A record was created successfully” is not adequate. We then changed the message that is presented after the creation to tell in the id of the background task that is creating the materialized query. The result of the query can then be consulted on the associated Task Results record on the Celery Results section app of the Django admin console. response_change: changes here with the same ideas behind as response_add. If any catalogue results files are being uploaded to the platform, any worker attempting to create or change a materialized view will block until such data is uploaded. Also if any worker is creating materialized views, no other worker can upload catalogue results data. Through the admin console, there is also the possibility to refresh a specific MaterializedQuery. To do so, on the list view, select the MaterializedQueries to refresh, then on the actions dropdown select “Refresh selected materialized queries”. Once again to avoid timeouts, such operations are executed on a background task. Tabs Manager Currently, this app is not being used and the URL mapping was delete. To use it again uncomment the tabsManager line on the dashboard_viewer/dashboard_viewer/urls.py file. Then you can access the tabs page through the [BASE_URL]/tabs/ URL. Views On this app, there is only one view. It is a simple page with just a sidebar to choose which dashboard to displays on an iframe. Besides the simplicity, all the animations around the sidebar buttons are handled by CSS with some JS that adds and removes classes to HTML elements, as events (hover and click) happen. To facilitate the development process of CSS, SCSS was used to build styling of the view. It prevents duplication with the addition of variables and adds the possibility to express parent classes by nesting their declaration. In cases where there are a lot of buttons on the sidebar, some buttons might get impossible to reach since they are out of the field of view. To avoid this we make use of SimpleBar, which makes the sidebar scrollable, displaying a scroll bar on the right side of the sidebar whenever there are elements outside of the field of view. API There is one endpoint, [BASE_URL]/api/, where a JSON object of tabs and groups of tabs and their sub-tabs are returned. Models Uploader Views This app exposes three views: 1. Creation of a data source 2. Edition of a data source 3. To Upload or consult the history of uploads of catalogue results files. The first one can be accessed through the [BASE_URL]/uploader/[DATA_SOURCE_HASH]/ URL. If no hash is provided on the URL then on the creation of the data source a random one will be assigned. If there is already a data source with the provided hash then the user is redirected to the upload page of that data source. This view also allows creating data sources without displaying the webform, redirecting directly to the uploader page. This can be achieved by providing the data of several fields of the form as URL arguments. E.g. [BASE_URL]/uploader/[DATA_SOURCE_HASH]/?acronym=test.... This is implemented in a way so that whenever a GET is performed, it checks the URL arguments and tries to submit the data source form. If it is valid, all the required fields were provided and are valid, then the user is redirected to the upload page. Else all the valid values are set in the form, the invalid ones are being discarded, and the data source creation page is presented with no error messages. The country field should contain a value from the ones available on the dropdown presented in the webform and since the coordinates is a two-component value it should be provided as coordinates_0=[LATITUDE]&amp;coordinates_1=[LONGITUDE]. It is important to note that this view does not require a CSRF token, so a normal POST form submission can be performed to create a data source. The second one can be accessed through the [BASE_URL]/uploader/[DATA_SOURCE_HASH]/edit/ URL or by clicking on the Edit button on the data source upload page. Finally, on the upload page, a data owner can consult the history of uploads, their state, and eventually error messages if some went wrong. Whenever an upload is made its state will be pending. After the upload, with a 5-second interval, a request is made to the backend to check if the status of the upload changed. If it fails, an error message will be provided in a tooltip above a button with a message icon. Else the state will change to Done and the information about the upload retrieved from the uploaded file, present on the check status request, is filled. Related to file uploading, after the file form is submitted no validation is made and a message is presented to the user telling that the file is being processed in the background, then the fetch status process mentioned before starts. If validations were performed before returning a message to the user, if the validation took too much time, the browser could timeout. Also if some unexpected error happened on the insertion process performed in the background, the user would get any feedback. Related to the background task that validates and uploads the data, the validation can fail if: Error Message Invalid Number of Columns The provided file has an invalid number of columns Invalid CSV File Format The provided file has an invalid CSV format. Make sure is a text file separated by commas and you either have 7 (regular results file) or 13 (results file with dist columns) columns. Missing Required Fields Some rows have null values either on the column “analysis_id” or “count_value” Invalid Field Types The provided file has invalid values on some columns. Remember that only the \"stratum_*\" columns accept strings, all the other fields expect numeric types. Duplicated Metadata Rows Analysis id[output] duplicated on multiple rows. Try (re)running the plugin CatalogueExport on your database. Missing Required Metadata Row Analysis id 0 is missing. Try (re)running the plugin CatalogueExport on your database. Any other error is considered an unexpected error and the following message will be presented “An unexpected error occurred while processing your file. Please contact the system administrator for more details.”. If the file passes all validations, it goes to the upload data phase. Here, if workers are creating or refreshing materialized queries then the worker blocks. If there are other workers inserting data for the same data source it will also block. However, several workers of different data sources can insert data at the same time. All the workers, after inserting the data, check if they are the only worker inserting data. If so they refresh the existing materialized queries. Else the next worker to finish inserting data will do the same check. Widgets For the data source form two custom widgets were created for the following fields: Database Type: To avoid having duplicate entries with the same meaning (e.g. Hospital, hospital), the input of this field has a autocomplete list where existing values are suggested to the user. Also before saving the field to the database spaces are trimmed and the values are transformed into title case here. Coordinates: 1. This is a two-component field; 2. Inserting coordinates by hand is tedious. Considering the previous points, we created a widget with a map built with leaflet where the user just needs to click on the map. API This app provided two API endpoints Update data source information: a PATCH request with a JSON object on the body of the request with the fields and their new values. Pending upload status: a GET request that returns JSON data where there is always a status field that can have three statuses which then can lead to additional data be also present: Pending: the upload in question hasn’t finished Done: the upload finished and there was nothing wrong with the uploaded file. Along with the status, there will be a data field with a JSON object with the fields r_package_version, generation_date, cdm_version, and vocabulary_version which are data source information that was extracted from the uploaded file. Failed: the upload finished but there was something wrong with the uploaded file. Along with the status, there will be a failure_msg field telling the reason for the failure. Models Country data is loaded in a fresh installation through the docker-init.sh script if no records are present on the Country table. The DataSource model doesn’t have a foreign key to the DatabaseType model to then facilitate the creation of SQL queries to feet Superset’s dashboards. The DatabaseType is used anyway to have a faster way to check if a certain database type already exists on the database, avoiding going through every DataSource record. The same situation of the DatabaseType model also happens between the UploadHistory and PendingUpload models. There is no foreign key between a UploadHistory and a PendingUpload. This is because PendingUpload records are deleted once an upload is successful. When the upload view requests the status of a certain upload, it uses the id of the pending upload. If no pending upload is found, it is assumed that the upload was successful and searches for uploads on the UploadHistory model with the pending_upload_id field equal to the certain upload id. Related to where the uploaded files are stored, within the media directory there will be a ACHILLES_RESULTS_STORAGE_PATH directory which will have a directory for each data source. Within this last directory, first, files are uploaded to a failure directory. If the upload is successful the file is moved to a success directory. In both cases, the file name will be the date of when the file is being saved into disk plus its original extensions. JavaScript Packages While developing the templates for Django views, if a certain javascript library is required, like jquery, one option is to insert script tags on the templates and point the src to a CDN. However, this makes the process of maintaining the libraries tedious since a developer has to search and change all the script tags if for example wants to update the library’s version. To avoid this problem we have a package.json file where we define all the libraries that we use and their version. Then we add the node_modules directory as a static file directory. With this alternative, updating a library is as simple as changing a number of the package.json file, run npm install and collect the static files again. "],["dashboards.html", "Chapter 9 Dashboards ", " Chapter 9 Dashboards "],["PerDatabaseDashboard.html", "9.1 Network Dashboard", " 9.1 Network Dashboard Label Colors In order to obtain the colors blue and rose in the chart representing the gender distribution, add the following JSON entry to the JSON object of the JSON Metadata field on the edit dashboard page: &quot;label_colors&quot;: { &quot;Male&quot;: &quot;#3366FF&quot;, &quot;Female&quot;: &quot;#FF3399&quot; } CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the “Edit Dashboard” button can show again. Filters Country Filter Dataset: Materialized View meta_data_table Database Type Filter Dataset: Materialized View meta_data_table Data Source Filter Dataset: Materialized View meta_data_table Overview Tab Countries Dataset: Materialized View meta_data_table Data Sources Dataset: Materialized View meta_data_table Datasource Types Dataset: Materialized View meta_data_table Patients Dataset: Materialized View meta_data_table Patients Dataset: Materialized View meta_data_table Patients by Country Dataset: Materialized View meta_data_table Database Types per Country Dataset: Materialized View meta_data_table Meta Data Dataset: Materialized View meta_data_table Demographics Tab Number of Patients Dataset: Materialized View number_of_patients Gender Table Dataset: Materialized View gender Gender Pie Dataset: Materialized View gender Age at first observation Table Dataset: Materialized View age1observation_table Age at first observation Bar Chart Dataset: Materialized View age1observation_bar_chart Distribution of age at first observation period Dataset: Materialized View distribution_of_age_at_first_observation_period Year of Birth Dataset: Materialized View year_of_birth Data Domains Tab Average number of records per person Dataset: Materialized View avg_num_of_records_per_person Total number of records Dataset: Materialized View data_domain_total_num_of_records Number of distinct visit occurrence concepts per person Dataset: Materialized View number_of_distinct_per_person Number of distinct condition occurrence concepts per person Dataset: Materialized View number_of_distinct_per_person Number of distinct procedure occurrence concepts per person Dataset: Materialized View number_of_distinct_per_person Number of distinct drug exposure concepts per person Dataset: Materialized View number_of_distinct_per_person Number of distinct observation occurrence concepts per person Dataset: Materialized View number_of_distinct_per_person Number of distinct mesurement occurrence concepts per person Dataset: Materialized View number_of_distinct_per_person Data Provenance Tab Dataset: Materialized View data_provenance Observation Period Tab Number of Patitents in Observation Period Dataset: Materialized View num_of_patients_in_observation_period Cumulative Observation Period Dataset: Materialized View cumulative_observation_time Number of Observation Periods Dataset: Materialized View number_of_observation_periods Length of observation (days) of first observation period Dataset: Materialized View length_of_observation_of_first_observation_period Visit Tab Visit Type Graph Dataset: Materialized View visit_type_bar_chart Visit Type Dataset: Materialized View visit_type_table Concept Browser Tab Domain Filter Dataset: Materialized View domain_filter Concept Browser Dataset: Materialized View concept_browser_table3 Concept Network Coverage Dataset: Materialized View concept_coverage2 About Tab Markdown dashboard components "],["database-level-dashboard.html", "9.2 Database-Level Dashboard", " 9.2 Database-Level Dashboard This dashboard is an exact copy of the Network Dashboard dashboard but several legends and fields displayed on the original are hidden either through CSS or by changing some chart settings. On the following sections we will only present the things to change on the original charts. Label Colors In order to obtain the colors blue and rose in the chart representing the gender distribution, add the following JSON entry to the JSON object of the JSON Metadata field on the edit dashboard page: &quot;label_colors&quot;: { &quot;Male&quot;: &quot;#3366FF&quot;, &quot;Female&quot;: &quot;#FF3399&quot; } CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: /* hides the filter badges on right side of charts */ .dashboard-filter-indicators-container { display: none; } /* hides the acronym filter */ .grid-content &gt; .dragdroppable.dragdroppable-row &gt; .with-popover-menu { display: none; } /* * WARNING panel 1 id hardcoded * Hides the X Axis Label of the heatmap on the Data Domains tab */ #TABS-nlIU6H5mcT-pane-1 g.x.axis &gt; g.tick text { display: none; } /* * WARNING panel 2 id hardcoded * Hides the X Axis Labels of the bar charts on the Data Provenance tab */ #TABS-nlIU6H5mcT-pane-2 g.nv-x.nv-axis.nvd3-svg &gt; g.nvd3.nv-wrap.nv-axis &gt; g &gt; g.tick.zero &gt; text { display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the “Edit Dashboard” button can show again. Data Source Filter - hidden Dataset: data_source table of the achilles database. For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. Demographics Tab Number of Patients No changes Gender Table No changes Gender Pie No changes Age at first observation - Bars Remove legend. Customize Tab Chart Options Legend: off Distribution of age at first observation period No changes Year of Birth Remove legend. Customize Tab Chart Options Legend: off Data Domains Tab Average number of records per person No changes Total number of records No changes Data Density Plot Dataset: Materialized View data_density Records per person Dataset: Materialized View records_per_person Concepts per person Dataset: Materialized View number_of_distinct_per_person Data Provenance Tab Type Concepts Dataset: Materialized View data_provenance Observation Period Tab Number of Patitents in Observation Period Remove legend. Customize Tab Chart Options Legend: off Length of observation (days) of first observation period No changes Cumulative Observation Period Remove legend. Customize Tab Chart Options Legend: off Number of Observation Periods No changes Visit Tab Visit Type Graph Remove legend. Customize Tab Chart Options Legend: off Visit Type Table Remove the name field from the columns to display. Data Tab Query Columns: visit_type, num_persons, percent_persons with label persons (%), records_per_person Visit Age Distribution Dataset: Materialized View visit_age_distribution Concept Browser Tab Domain Filter No changes Concept Browser Dataset: Materialized View concept_browser_table2 Meta Data Tab Meta Data Dataset: Materialized View meta_data_table "],["materialized-views-1.html", "9.3 Materialized views", " 9.3 Materialized views meta_data_table SELECT data_source.acronym, data_source.name, data_source.database_type, country.country, p.count_value AS number_of_patients, a.stratum_2 AS source_release_date, a.stratum_3 AS cdm_release_date, a.stratum_4 AS cdm_version, a.stratum_5 AS vocabulary_version, p.stratum_3 AS execution_date, p.stratum_2 AS package_version FROM (((achilles_results a JOIN data_source ON ((a.data_source_id = data_source.id))) JOIN country ON ((data_source.country_id = country.id))) JOIN ( SELECT achilles_results.count_value, achilles_results.data_source_id, achilles_results.stratum_2, achilles_results.stratum_3 FROM achilles_results WHERE (achilles_results.analysis_id = 0)) p ON p.data_source_id = data_source.id) WHERE (a.analysis_id = 5000); patients_per_country_and_database_type SELECT country.country, source.database_type, achilles.count_value FROM ( (achilles_results achilles JOIN data_source source ON (achilles.data_source_id = source.id)) JOIN country country ON source.country_id = country.id) WHERE (achilles.analysis_id = 1); number_of_patients SELECT achilles_results.count_value, data_source.name, data_source.acronym, data_source.database_type, country.country FROM ((achilles_results JOIN data_source ON ((achilles_results.data_source_id = data_source.id))) JOIN country ON ((data_source.country_id = country.id))) WHERE (achilles_results.analysis_id = 1); gender SELECT source.name, source.acronym, source.database_type, country.country, concept.concept_name AS gender, achilles.count_value FROM (((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) JOIN concept ON ((achilles.stratum_1 = (concept.concept_id)::text))) WHERE (achilles.analysis_id = 2); age1observation_table SELECT source.name, source.acronym, source.database_type, country.country, sum( CASE WHEN ( (achilles.stratum_2):: integer &lt; 10 ) THEN achilles.count_value ELSE NULL :: bigint END ) AS &quot;0-10&quot;, sum( CASE WHEN ( ( (achilles.stratum_2):: integer &gt;= 10 ) AND ( (achilles.stratum_2):: integer &lt; 20 ) ) THEN achilles.count_value ELSE NULL :: bigint END ) AS &quot;10-20&quot;, sum( CASE WHEN ( ( (achilles.stratum_2):: integer &gt;= 20 ) AND ( (achilles.stratum_2):: integer &lt; 30 ) ) THEN achilles.count_value ELSE NULL :: bigint END ) AS &quot;20-30&quot;, sum( CASE WHEN ( ( (achilles.stratum_2):: integer &gt;= 30 ) AND ( (achilles.stratum_2):: integer &lt; 40 ) ) THEN achilles.count_value ELSE NULL :: bigint END ) AS &quot;30-40&quot;, sum( CASE WHEN ( ( (achilles.stratum_2):: integer &gt;= 40 ) AND ( (achilles.stratum_2):: integer &lt; 50 ) ) THEN achilles.count_value ELSE NULL :: bigint END ) AS &quot;40-50&quot;, sum( CASE WHEN ( ( (achilles.stratum_2):: integer &gt;= 50 ) AND ( (achilles.stratum_2):: integer &lt; 60 ) ) THEN achilles.count_value ELSE NULL :: bigint END ) AS &quot;50-60&quot;, sum( CASE WHEN ( ( (achilles.stratum_2):: integer &gt;= 60 ) AND ( (achilles.stratum_2):: integer &lt; 70 ) ) THEN achilles.count_value ELSE NULL :: bigint END ) AS &quot;60-70&quot;, sum( CASE WHEN ( ( (achilles.stratum_2):: integer &gt;= 70 ) AND ( (achilles.stratum_2):: integer &lt; 80 ) ) THEN achilles.count_value ELSE NULL :: bigint END ) AS &quot;70-80&quot;, sum( CASE WHEN ( ( (achilles.stratum_2):: integer &gt;= 80 ) AND ( (achilles.stratum_2):: integer &lt; 90 ) ) THEN achilles.count_value ELSE NULL :: bigint END ) AS &quot;80-90&quot;, sum( CASE WHEN ( (achilles.stratum_2):: integer &gt;= 90 ) THEN achilles.count_value ELSE NULL :: bigint END ) AS &quot;90+&quot; FROM (((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) JOIN concept ON ((achilles.stratum_1 = (concept.concept_id)::text))) WHERE (achilles.analysis_id = 102) GROUP BY source.name, source.acronym, source.database_type, country.country; age1observation_bar_chart SELECT source.name, (achilles.stratum_1)::integer AS age, achilles.count_value AS count, source.acronym, source.database_type, country.country FROM ((achilles_results achilles JOIN data_source source ON achilles.data_source_id = source.id) JOIN country ON ((country.id = source.country_id))) WHERE (achilles.analysis_id = 101); distribution_of_age_at_first_observation_period SELECT source.name, source.acronym, country.country, achilles.count_value, achilles.p10_value AS p10, achilles.p25_value AS p25, achilles.median_value AS median, achilles.p75_value AS p75, achilles.p90_value AS p90, achilles.max_value, achilles.min_value FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((source.country_id = country.id))) WHERE (achilles.analysis_id = 103) ORDER BY source.name; year_of_birth SELECT source.name, source.acronym, source.database_type, country.country, achilles.stratum_1 AS &quot;Birth_year&quot;, achilles.count_value AS count FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) WHERE (achilles.analysis_id = 3); avg_num_of_records_per_person SELECT source.name, source.acronym, source.database_type, country.country, CASE WHEN (achilles.analysis_id = 201) THEN &#39;Visit&#39;::text WHEN (achilles.analysis_id = 401) THEN &#39;Condition&#39;::text WHEN (achilles.analysis_id = 501) THEN &#39;Death&#39;::text WHEN (achilles.analysis_id = 601) THEN &#39;Procedure&#39;::text WHEN (achilles.analysis_id = 701) THEN &#39;Drug Exposure&#39;::text WHEN (achilles.analysis_id = 801) THEN &#39;Observation&#39;::text WHEN (achilles.analysis_id = 1801) THEN &#39;Measurement&#39;::text WHEN (achilles.analysis_id = 2101) THEN &#39;Device&#39;::text WHEN (achilles.analysis_id = 2201) THEN &#39;Note&#39;::text ELSE NULL::text END AS data_domain, (sum(achilles.count_value) / avg(counts.num_persons)) AS records_per_person FROM (((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) JOIN ( SELECT achilles_results.data_source_id, achilles_results.count_value AS num_persons FROM achilles_results WHERE (achilles_results.analysis_id = 1)) counts ON achilles.data_source_id = counts.data_source_id) GROUP BY achilles.analysis_id, source.name, source.acronym, source.database_type, country.country HAVING ( achilles.analysis_id = ANY ( ARRAY[(201):: bigint, (401):: bigint, (501):: bigint, (601):: bigint, (701):: bigint, (801):: bigint, (1801):: bigint, (2101):: bigint, (2201):: bigint] ) ); data_domain_total_num_of_records SELECT data_source.name, data_source.acronym, data_source.database_type, country.country, CASE WHEN (achilles_results.analysis_id = 201) THEN &#39;Visit&#39;::text WHEN (achilles_results.analysis_id = 401) THEN &#39;Condition&#39;::text WHEN (achilles_results.analysis_id = 501) THEN &#39;Death&#39;::text WHEN (achilles_results.analysis_id = 601) THEN &#39;Procedure&#39;::text WHEN (achilles_results.analysis_id = 701) THEN &#39;Drug Exposure&#39;::text WHEN (achilles_results.analysis_id = 801) THEN &#39;Observation&#39;::text WHEN (achilles_results.analysis_id = 1801) THEN &#39;Measurement&#39;::text WHEN (achilles_results.analysis_id = 2101) THEN &#39;Device&#39;::text WHEN (achilles_results.analysis_id = 2201) THEN &#39;Note&#39;::text ELSE NULL::text END AS data_domain, sum(achilles_results.count_value) AS count FROM ((achilles_results JOIN data_source ON ((achilles_results.data_source_id = data_source.id))) JOIN country ON ((country.id = data_source.country_id))) GROUP BY data_source.name, data_source.acronym, data_source.database_type, country.country, achilles_results.analysis_id HAVING ( achilles_results.analysis_id = ANY ( ARRAY[(201):: bigint, (401):: bigint, (501):: bigint, (601):: bigint, (701):: bigint, (801):: bigint, (1801):: bigint, (2101):: bigint, (2201):: bigint] ) ); number_of_distinct_per_person SELECT source.name, source.acronym, country.country, achilles.analysis_id, CASE WHEN (achilles.analysis_id = 203) THEN &#39;Visit&#39;::text WHEN (achilles.analysis_id = 403) THEN &#39;Condition&#39;::text WHEN (achilles.analysis_id = 603) THEN &#39;Procedure&#39;::text WHEN (achilles.analysis_id = 703) THEN &#39;Drug Exposure&#39;::text WHEN (achilles.analysis_id = 803) THEN &#39;Observation&#39;::text WHEN (achilles.analysis_id = 1803) THEN &#39;Measurement&#39;::text ELSE NULL::text END AS data_domain, achilles.count_value, achilles.min_value, achilles.p10_value AS p10, achilles.p25_value AS p25, achilles.median_value AS median, achilles.p75_value AS p75, achilles.p90_value AS p90, achilles.max_value FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((source.country_id = country.id))) WHERE ( achilles.analysis_id = ANY ( ARRAY[(203):: bigint, (403):: bigint, (603):: bigint, (703):: bigint, (803):: bigint, (183):: bigint] ) ) ORDER BY source.name; data_provenance SELECT source.name, source.acronym, source.database_type, country.country, CASE WHEN (achilles.analysis_id = 405) THEN &#39;Condition&#39;::text WHEN (achilles.analysis_id = 605) THEN &#39;Procedure&#39;::text WHEN (achilles.analysis_id = 705) THEN &#39;Drug&#39;::text WHEN (achilles.analysis_id = 805) THEN &#39;Observation&#39;::text WHEN (achilles.analysis_id = 1805) THEN &#39;Measurement&#39;::text WHEN (achilles.analysis_id = 2105) THEN &#39;Device&#39;::text ELSE &#39;Other&#39;::text END AS domain_name, c1.concept_name, sum(achilles.count_value) AS num_records FROM (((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) JOIN concept c1 ON ((achilles.stratum_2 = (c1.concept_id)::text))) WHERE ( achilles.analysis_id = ANY ( ARRAY[(405):: bigint, (605):: bigint, (705):: bigint, (805):: bigint, (1805):: bigint, (2105):: bigint] ) ) GROUP BY source.name, source.acronym, source.database_type, country.country, c1.concept_name, CASE WHEN (achilles.analysis_id = 405) THEN &#39;Condition&#39;::text WHEN (achilles.analysis_id = 605) THEN &#39;Procedure&#39;::text WHEN (achilles.analysis_id = 705) THEN &#39;Drug&#39;::text WHEN (achilles.analysis_id = 805) THEN &#39;Observation&#39;::text WHEN (achilles.analysis_id = 1805) THEN &#39;Measurement&#39;::text WHEN (achilles.analysis_id = 2105) THEN &#39;Device&#39;::text ELSE &#39;Other&#39;::text END; num_of_patients_in_observation_period SELECT source.name, source.acronym, source.database_type, country.country, to_date(achilles.stratum_1, &#39;YYYYMM&#39;::text) AS date, achilles.count_value AS &quot;Nr_patients&quot; FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((country.id = source.country_id))) WHERE (achilles.analysis_id = 110); cumulative_observation_time SELECT data_source.name, data_source.acronym, data_source.database_type, country.country, cumulative_sums.xlengthofobservation, round( (cumulative_sums.cumulative_sum / (totals.total):: numeric), 5 ) AS ypercentpersons FROM ( ( ( ( SELECT achilles_results.data_source_id, ( (achilles_results.stratum_1):: integer * 30 ) AS xlengthofobservation, sum(achilles_results.count_value) OVER ( PARTITION BY achilles_results.data_source_id ORDER BY (achilles_results.stratum_1):: integer DESC ) AS cumulative_sum FROM achilles_results WHERE ( achilles_results.analysis_id = 108 ) ) cumulative_sums JOIN ( SELECT achilles_results.data_source_id, achilles_results.count_value AS total FROM achilles_results WHERE (achilles_results.analysis_id = 1) ) totals ON ( ( cumulative_sums.data_source_id = totals.data_source_id ) ) ) JOIN data_source ON ((cumulative_sums.data_source_id = data_source.id)) ) JOIN country ON ((country.id = data_source.country_id)) ) ORDER BY data_source.name, cumulative_sums.xlengthofobservation; number_of_observation_periods SELECT ar.data_source_id AS id, ds.acronym, ds.name, country.country, ar.stratum_1, ar.count_value, pa.nrpatients AS patients, round( ( ((100)::numeric * (ar.count_value)::numeric) / (pa.nrpatients)::numeric ), 2 ) AS percentage FROM (((achilles_results ar JOIN data_source ds ON ((ds.id = ar.data_source_id))) JOIN country ON ((ds.country_id = country.id))) JOIN ( SELECT achilles_results.count_value AS nrpatients, achilles_results.data_source_id FROM achilles_results WHERE (achilles_results.analysis_id = 0)) pa ON ((pa.data_source_id = ds.id))) WHERE (ar.analysis_id = 113); length_of_observation_of_first_observation_period SELECT source.name, source.acronym, country.country, achilles.count_value, achilles.min_value, achilles.p10_value AS p10, achilles.p25_value AS p25, achilles.median_value AS median, achilles.p75_value AS p75, achilles.p90_value AS p90, achilles.max_value FROM ((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN country ON ((source.country_id = country.id))) WHERE (achilles.analysis_id = 105) ORDER BY source.name; visit_type_bar_chart SELECT data_source.name, data_source.acronym, data_source.database_type, country.country, concept.concept_name, achilles_results.count_value AS num_persons FROM (((( SELECT achilles_results_1.id, achilles_results_1.analysis_id, achilles_results_1.stratum_1, achilles_results_1.stratum_2, achilles_results_1.stratum_3, achilles_results_1.stratum_4, achilles_results_1.stratum_5, achilles_results_1.count_value, achilles_results_1.data_source_id, achilles_results_1.avg_value, achilles_results_1.max_value, achilles_results_1.median_value, achilles_results_1.min_value, achilles_results_1.p10_value, achilles_results_1.p25_value, achilles_results_1.p75_value, achilles_results_1.p90_value, achilles_results_1.stdev_value FROM achilles_results achilles_results_1 WHERE (achilles_results_1.analysis_id = 200) ) achilles_results JOIN data_source ON ((achilles_results.data_source_id = data_source.id))) JOIN country ON ((country.id = data_source.country_id))) JOIN concept ON (achilles_results.stratum_1)::integer = concept.concept_id ); visit_type_table SELECT data_source.name, data_source.acronym, data_source.database_type, country.country, concept.concept_name, ar1.count_value AS num_persons, round( ( (100.0 * (ar1.count_value)::numeric) / (denom.count_value)::numeric ), 2 ) AS percent_persons, round( ( (1.0 * (ar2.count_value)::numeric) / (ar1.count_value)::numeric ), 2 ) AS records_per_person FROM (((((( SELECT achilles_results.id, achilles_results.analysis_id, achilles_results.stratum_1, achilles_results.stratum_2, achilles_results.stratum_3, achilles_results.stratum_4, achilles_results.stratum_5, achilles_results.count_value, achilles_results.data_source_id, achilles_results.avg_value, achilles_results.max_value, achilles_results.median_value, achilles_results.min_value, achilles_results.p10_value, achilles_results.p25_value, achilles_results.p75_value, achilles_results.p90_value, achilles_results.stdev_value FROM achilles_results WHERE (achilles_results.analysis_id = 200)) ar1 JOIN ( SELECT achilles_results.id, achilles_results.analysis_id, achilles_results.stratum_1, achilles_results.stratum_2, achilles_results.stratum_3, achilles_results.stratum_4, achilles_results.stratum_5, achilles_results.count_value, achilles_results.data_source_id, achilles_results.avg_value, achilles_results.max_value, achilles_results.median_value, achilles_results.min_value, achilles_results.p10_value, achilles_results.p25_value, achilles_results.p75_value, achilles_results.p90_value, achilles_results.stdev_value FROM achilles_results WHERE (achilles_results.analysis_id = 201)) ar2 ON (((ar1.stratum_1 = ar2.stratum_1) AND (ar1.data_source_id = ar2.data_source_id)))) JOIN ( SELECT achilles_results.id, achilles_results.analysis_id, achilles_results.stratum_1, achilles_results.stratum_2, achilles_results.stratum_3, achilles_results.stratum_4, achilles_results.stratum_5, achilles_results.count_value, achilles_results.data_source_id, achilles_results.avg_value, achilles_results.max_value, achilles_results.median_value, achilles_results.min_value, achilles_results.p10_value, achilles_results.p25_value, achilles_results.p75_value, achilles_results.p90_value, achilles_results.stdev_value FROM achilles_results WHERE (achilles_results.analysis_id = 1)) denom ON ((ar1.data_source_id = denom.data_source_id))) JOIN data_source ON ((data_source.id = ar1.data_source_id))) JOIN country ON ((country.id = data_source.country_id))) JOIN concept ON (((ar1.stratum_1)::integer = concept.concept_id))) ORDER BY ar1.data_source_id, ar1.count_value DESC; domain_filter SELECT concept.concept_name, concept.domain_id, source.name, source.acronym, source.database_type, country.country FROM ( ( ( achilles_results JOIN concept ON ( ( (achilles_results.stratum_1):: bigint = concept.concept_id ) ) ) JOIN data_source source ON ( ( achilles_results.data_source_id = source.id ) ) ) JOIN country ON ( (country.id = source.country_id) ) ) WHERE ( achilles_results.analysis_id = ANY ( ARRAY[(201):: bigint, (401):: bigint, (601):: bigint, (701):: bigint, (801):: bigint, (901):: bigint, (1001):: bigint, (1801):: bigint, (200):: bigint, (400):: bigint, (600):: bigint, (700):: bigint, (800):: bigint, (1800):: bigint] ) ); concept_browser_table3 SELECT source.name, source.acronym, source.database_type, country.country, ( ( ( ( &#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39; :: text || ar1.concept_id ) || &#39;&quot;target=&quot;_blank&quot;&gt;&#39; :: text ) || ar1.concept_id ) || &#39;&lt;/a&gt;&#39; :: text ) AS concept_id, concept.concept_name, concept.domain_id, (ar1.rc):: integer AS rc, (ar2.drc):: integer AS drc FROM ( ( ( ( ( SELECT achilles_results.data_source_id, achilles_results.analysis_id, achilles_results.stratum_1 AS concept_id, achilles_results.count_value AS rc FROM achilles_results WHERE ( achilles_results.analysis_id = ANY ( ARRAY[(401):: bigint, (601):: bigint, (701):: bigint, (801):: bigint, (1801):: bigint, (2101):: bigint] ) ) ) ar1 JOIN ( SELECT ar.data_source_id, ar.analysis_id, ar.stratum_1 AS concept_id, ar.count_value AS drc FROM achilles_results ar WHERE ( ar.analysis_id = ANY ( ARRAY[(430):: bigint, (630):: bigint, (730):: bigint, (830):: bigint, (1830):: bigint, (2130):: bigint] ) ) ) ar2 ON ( ( (ar1.concept_id = ar2.concept_id) AND ( ar1.data_source_id = ar2.data_source_id ) ) ) ) JOIN data_source source ON ( (ar1.data_source_id = source.id) ) ) JOIN country ON ( (source.country_id = country.id) ) ) JOIN concept concept ON ( ( ar1.concept_id = (concept.concept_id):: text ) ) ) ORDER BY ( (ar2.drc):: integer ) DESC; concept_coverage2 SELECT source.name AS source_name, source.database_type, country.country, ( ( ( ( &#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39; :: text || concept.concept_id ) || &#39;&quot; target=&quot;_blank&quot;&gt;&#39; :: text ) || concept.concept_id ) || &#39;&lt;/a&gt;&#39; :: text ) AS concept_id, concept.concept_name, concept.domain_id, sum( (ar1.rc):: integer ) AS rc, sum( (ar2.drc):: integer ) AS drc FROM ( ( ( ( ( SELECT achilles_results.data_source_id, achilles_results.analysis_id, achilles_results.stratum_1 AS concept_id, achilles_results.count_value AS rc FROM achilles_results WHERE ( achilles_results.analysis_id = ANY ( ARRAY[(401):: bigint, (601):: bigint, (701):: bigint, (801):: bigint, (1801):: bigint, (2101):: bigint] ) ) ) ar1 JOIN ( SELECT ar.data_source_id, ar.analysis_id, ar.stratum_1 AS concept_id, ar.count_value AS drc FROM achilles_results ar WHERE ( ar.analysis_id = ANY ( ARRAY[(430):: bigint, (630):: bigint, (730):: bigint, (830):: bigint, (1830):: bigint, (2130):: bigint] ) ) ) ar2 ON ( ( (ar1.concept_id = ar2.concept_id) AND ( ar1.data_source_id = ar2.data_source_id ) ) ) ) JOIN data_source source ON ( (ar1.data_source_id = source.id) ) ) JOIN country ON ( (country.id = source.country_id) ) ) JOIN concept concept ON ( ( ar1.concept_id = (concept.concept_id):: text ) ) ) GROUP BY source.name, source.database_type, country.country, concept.domain_id, concept.concept_id, concept.concept_name; data_density SELECT source.acronym, t1.table_name AS series_name, to_date(t1.stratum_1, &#39;YYYYMM&#39;::text) AS x_calendar_month, t1.count_value AS y_record_count FROM (( SELECT achilles_results.data_source_id AS id, &#39;Visit occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 220) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Condition occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 420) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Death&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 502) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Procedure occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 620) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Drug exposure&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 720) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Observation&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 820) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Drug era&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 920) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Device Exposure&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 2120) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Condition era&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 1020) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Observation period&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 111) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Measurement&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 1820)) t1 JOIN data_source source ON ((source.id = t1.id))) ORDER BY t1.table_name, ( CASE WHEN (t1.stratum_1 ~ &#39;^\\d+\\.?\\d+$&#39;::text) THEN t1.stratum_1 ELSE NULL::text END)::integer; records_per_person SELECT source.acronym, t1.table_name AS series_name, to_date(t1.stratum_1, &#39;YYYYMM&#39;::text) AS x_calendar_month, round( ( (1.0 * (t1.count_value)::numeric) / (denom.count_value)::numeric ), 5 ) AS y_record_count FROM ((( SELECT achilles_results.data_source_id AS id, &#39;Visit occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 220) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Condition occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 420) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Death&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 502) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Procedure occurrence&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 620) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Drug exposure&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 720) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Observation&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 820) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Device exposure&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 2120) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Drug era&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 920) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Condition era&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 1020) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Observation period&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 111) UNION ALL SELECT achilles_results.data_source_id AS id, &#39;Measurement&#39;::text AS table_name, achilles_results.stratum_1, achilles_results.count_value FROM achilles_results WHERE (achilles_results.analysis_id = 1820)) t1 JOIN ( SELECT achilles_results.id, achilles_results.analysis_id, achilles_results.stratum_1, achilles_results.stratum_2, achilles_results.stratum_3, achilles_results.stratum_4, achilles_results.stratum_5, achilles_results.count_value, achilles_results.data_source_id, achilles_results.avg_value, achilles_results.max_value, achilles_results.median_value, achilles_results.min_value, achilles_results.p10_value, achilles_results.p25_value, achilles_results.p75_value, achilles_results.p90_value, achilles_results.stdev_value FROM achilles_results WHERE (achilles_results.analysis_id = 117)) denom ON (((t1.stratum_1 = denom.stratum_1) AND (t1.id = denom.data_source_id)))) JOIN data_source source ON ((source.id = t1.id))) ORDER BY t1.table_name, ( CASE WHEN (t1.stratum_1 ~ &#39;^\\d+\\.?\\d+$&#39;::text) THEN t1.stratum_1 ELSE NULL::text END)::integer; visit_age_distribution SELECT source.name, source.acronym, c1.concept_name, c2.concept_name AS gender, achilles.count_value, achilles.p10_value AS p10, achilles.p25_value AS p25, achilles.median_value AS median, achilles.p75_value AS p75, achilles.p90_value AS p90 FROM (((achilles_results achilles JOIN data_source source ON ((achilles.data_source_id = source.id))) JOIN concept c1 ON ((achilles.stratum_1 = (c1.concept_id)::text))) JOIN concept c2 ON ((achilles.stratum_2 = (c2.concept_id)::text))) WHERE (achilles.analysis_id = 206) ORDER BY source.name, c1.concept_name, c2.concept_name; concept_browser_table2 SELECT source.acronym, ( ( ( ( &#39;&lt;a href=&quot;https://athena.ohdsi.org/search-terms/terms/&#39; :: text || ar1.concept_id ) || &#39;&quot;target=&quot;_blank&quot;&gt;&#39; :: text ) || ar1.concept_id ) || &#39;&lt;/a&gt;&#39; :: text ) AS concept_id, concept.concept_name, concept.domain_id, (ar1.rc):: integer AS rc, (ar2.drc):: integer AS drc FROM ( ( ( ( SELECT achilles_results.data_source_id, achilles_results.analysis_id, achilles_results.stratum_1 AS concept_id, achilles_results.count_value AS rc FROM achilles_results WHERE ( achilles_results.analysis_id = ANY ( ARRAY[(401):: bigint, (601):: bigint, (701):: bigint, (801):: bigint, (1801):: bigint, (2101):: bigint] ) ) ) ar1 JOIN ( SELECT ar.data_source_id, ar.analysis_id, ar.stratum_1 AS concept_id, ar.count_value AS drc FROM achilles_results ar WHERE ( ar.analysis_id = ANY ( ARRAY[(430):: bigint, (630):: bigint, (730):: bigint, (830):: bigint, (1830):: bigint, (2130):: bigint] ) ) ) ar2 ON ( ( (ar1.concept_id = ar2.concept_id) AND ( ar1.data_source_id = ar2.data_source_id ) ) ) ) JOIN data_source source ON ( (ar1.data_source_id = source.id) ) ) JOIN concept concept ON ( ( ar1.concept_id = (concept.concept_id):: text ) ) ) ORDER BY ((ar2.drc):: integer) DESC; "],["general-deprecated.html", "9.4 General [Deprecated]", " 9.4 General [Deprecated] CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the “Edit Dashboard” button can show again. Database Type and Country Filter Figure 9.1: Settings for creating filters charts Theses filter were designed to be used in the dashboard aiming the filtering of the data based on the field ‘’database_type’’ and “country” from the table ‘’data_source’’. For the filters to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query SELECT source.name, country.country, source.database_type, source.acronym FROM public.data_source AS source INNER JOIN public.country AS country ON source.country_id=country.id Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: database_type or country Date Filter: off Instant Filtering: on Total Number of Patients Figure 9.2: Settings for creating the Total Number of Patients chart SQL query SELECT country, database_type, release_date, SUM(count_value) OVER (ORDER BY release_date ASC) FROM achilles_results JOIN data_source ON data_source_id = data_source.id JOIN country ON data_source.country_id = country.id WHERE analysis_id = 1 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Big Number with Trendline Time Time range: No filter Query Metrics: MAX(sum) Series: release_date Breakdowns: source Customize Tab Chart Options Big Number Font Size: Small Subheader Font Size: Tiny Network Growth by Date Figure 9.3: Settings for creating the Network Growth by Date chart SQL query SELECT source.name AS source, country.country, source.database_type, source.release_date, concepts.concept_name AS gender, achilles.count_value as count FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.country AS country ON source.country_id=country.id JOIN ( SELECT &#39;8507&#39; AS concept_id, &#39;Male&#39; AS concept_name UNION SELECT &#39;8532&#39;, &#39;Female&#39; ) AS concepts ON achilles.stratum_1 = concept_id WHERE analysis_id = 2 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(count_value) Series: release_date Breakdowns: source Customize Tab Chart Options Stacked Bars: on Sort Bars: on Extra Controls: on X Axis Reduce X ticks: on Patients per Country Figure 9.4: Settings for creating the Patients per Country chart SQL query SELECT country.country, source.database_type, count_value FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.country AS country ON source.country_id=country.id WHERE analysis_id = 1 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(count_value) Series: country Customize Tab Chart Options Legend: off Y Axis Label: Nº of Patients X Axis X Axis Label: Country Database Types per Country Figure 9.5: Settings for creating the Database Type per Country chart SQL query Same as Patients per Country query Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Heatmap Time Time range: No filter Query X: country Y: database_type Metric: SUM(countr_value) Heatmap Options Left Margin: 75 Show Percentage: off World Map Figure 9.6: Settings for creating the World Map chart SQL query SELECT name, acronym, database_type, latitude, longitude, country FROM public.data_source AS source INNER JOIN public.country AS country ON source.country_id=country.id Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: MapBox Time Time range: No filter Query Longitude: longitude Latitude: latitude Visual Tweaks Map Style: Streets or Light or Outdoors Meta Data Figure 9.7: Settings for creating the Meta Data chart SQL query SELECT acronym, stratum_1 as &quot;name&quot;, database_type, country, stratum_2 as &quot;source_release_date&quot;, stratum_3 as &quot;cdm_release_date&quot;, stratum_4 as &quot;cdm_version&quot;, stratum_5 as &quot;vocabulary_version&quot; FROM achilles_results JOIN data_source ON achilles_results.data_source_id = data_source.id JOIN country ON data_source.country_id = country.id WHERE analysis_id=5000 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Table Time Time range: No filter Query Query Mode: Raw Records Columns: name, source_release_date, cdm_release_date, cdm_version, vocabulary_version "],["person-deprecated.html", "9.5 Person [Deprecated]", " 9.5 Person [Deprecated] Label Colors In order to obtain the colors blue and rose in the chart representing the gender distribution, add the following JSON entry to the JSON object of the JSON Metadata field on the edit dashboard page: &quot;label_colors&quot;: { &quot;Male&quot;: &quot;#3366FF&quot;, &quot;Female&quot;: &quot;#FF3399&quot; } CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the “Edit Dashboard” button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Age at first observation - Table {#age1ObservationTable} Figure 9.9: Settings for creating the Age at First Observation Table chart SQL query SELECT source.name, source.acronym, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &lt; 10 THEN count_value END) AS &quot;0-10&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 10 AND CAST(stratum_2 AS INTEGER) &lt; 20 THEN count_value END) AS &quot;10-20&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 20 AND CAST(stratum_2 AS INTEGER) &lt; 30 THEN count_value END) AS &quot;20-30&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 30 AND CAST(stratum_2 AS INTEGER) &lt; 40 THEN count_value END) AS &quot;30-40&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 40 AND CAST(stratum_2 AS INTEGER) &lt; 50 THEN count_value END) AS &quot;40-50&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 50 AND CAST(stratum_2 AS INTEGER) &lt; 60 THEN count_value END) AS &quot;50-60&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 60 AND CAST(stratum_2 AS INTEGER) &lt; 70 THEN count_value END) AS &quot;60-70&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 70 AND CAST(stratum_2 AS INTEGER) &lt; 80 THEN count_value END) AS &quot;70-80&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 80 AND CAST(stratum_2 AS INTEGER) &lt; 90 THEN count_value END) AS &quot;80-90&quot;, SUM(CASE WHEN CAST(stratum_2 AS INTEGER) &gt;= 90 THEN count_value END) AS &quot;90+&quot; FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id WHERE analysis_id = 102 GROUP BY name, acronym Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Table Time Time range: No filter Query Query Mode: Raw Records Columns: name, 0-10, 10-20, 20-30, 30-40, 40-50, 50-60, 60-70, 70-80, 80-90, 90+ Customize Tab Options Show Cell Bars: off Age at first observation - Bars {#age1ObservationBars} Figure 9.10: Settings for creating the Age at First Observation Bar chart SQL query SELECT source.name, cast(stratum_1 AS int) AS Age, count_value AS count, source.acronym FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 101 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(count) Series: age Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label: Count X Axis X Axis Label: Age Reduce X ticks: on Year of Birth {#yearOfBirth} Figure 9.11: Settings for creating the Year of Birth chart SQL query SELECT source.name, source.acronym, stratum_1 AS &quot;Birth_year&quot;, count_value AS count FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 3 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(count) Series: Birth_year Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label: Count Extra Controls: on X Axis X Axis Label: Year Reduce X ticks: on Gender Figure 9.12: Settings for creating the Gender chart SQL query SELECT source.name, concept_name AS Gender, count_value AS Number_of_persons, source.acronym FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id JOIN ( SELECT &#39;8507&#39; AS concept_id, &#39;Male&#39; AS concept_name UNION SELECT &#39;8532&#39; AS concept_id, &#39;Female&#39; AS concept_name ) AS concepts ON achilles.stratum_1 = concept_id WHERE analysis_id = 2 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(Number_of_persons) Series: acronym Breakdowns: gender Contribution: on Customize Tab Chart Options Stacked Bars: on Sort Bars: on Extra Controls: on X Axis Reduce X ticks: on "],["observation-period-deprecated.html", "9.6 Observation Period [Deprecated]", " 9.6 Observation Period [Deprecated] CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the “Edit Dashboard” button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Number of Patients in Observation Period The Number of Patients in Observation Period plot shows the number of patients that contribute at least one day in a specific month. Figure 9.13: Settings for creating the Number of Patients in Observation Period chart SQL query SELECT source.name, source.acronym, to_date(stratum_1, &#39;YYYYMM&#39;) as Date, count_value FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 110 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(count_value) with label “Num of Patients” Series: date Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label: Number of Patients X Axis X Axis Label: Dates Reduce X ticks: on Observation Period Start Dates Figure 9.14: Settings for creating the Observation Period Start Dates chart SQL query SELECT source.name, source.acronym, to_date(stratum_1, &#39;YYYYMM&#39;) AS year_month, count_value FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 111 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(count_value) with label “Patients” Series: year_month Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label: Number of Patients X Axis X Axis Label: Year Reduce X ticks: on Observation Period End Dates Figure 9.15: Settings for creating the Observation Period End Dates chart SQL query SELECT source.name, source.acronym, to_date(stratum_1, &#39;YYYYMM&#39;) AS year_month, count_value FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 112 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(count_value) with label “Patients” Series: year_month Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label: Number of Patients X Axis X Axis Label: Year Reduce X ticks: on "],["visit-deprecated.html", "9.7 Visit [Deprecated]", " 9.7 Visit [Deprecated] This dashboard shows the different types of visits per data source (see Visit Occurence Table) CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the “Edit Dashboard” button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Visit Type Table Figure 9.16: Settings for creating the Visit Type Table chart SQL query SELECT source.name, source.acronym, concept_name AS &quot;Type&quot;, MAX(count_value) AS &quot;Count&quot; FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id WHERE analysis_id = 201 GROUP BY name, acronym, &quot;Type&quot; ORDER BY &quot;Count&quot; DESC Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Table Time Time range: No filter Query Query Mode: Raw Records Columns: name with label “Data Source”, Type, Count Visit Types Bars Figure 9.17: Settings for creating the Visit Types bar chart SQL query SELECT source.name, source.acronym, concept_name AS &quot;Observation&quot;, count_value FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id WHERE analysis_id = 201 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(count_value) with label Observations Series: name Breakdowns: Observation Customize Tab Chart Options Stacked Bars: on Sort Bars: on Extra Controls: on X Axis X Axis Label: Databases Reduce X ticks: on "],["death-deprecated.html", "9.8 Death [Deprecated]", " 9.8 Death [Deprecated] CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the “Edit Dashboard” button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Number of Records Figure 9.18: Settings for creating the Number of Records chart SQL query SELECT source.name, count_value, source.acronym FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id WHERE analysis_id = 501 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(count_value) with label Count Series: name Customize Tab Chart Options Y Axis Label: Number of Patients X Axis X Axis Label: Databases Reduce X ticks: on Death By Year per Thousand People Figure 9.19: Settings for creating the Death by Year per Thousand People chart SQL query SELECT source.name, source.acronym, EXTRACT(year FROM TO_DATE(stratum_1, &#39;YYYYMM&#39;)) AS Date, count_value FROM public.achilles_results as achilles INNER JOIN public.data_source as source ON achilles.data_source_id=source.id WHERE analysis_id = 502 Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: MAX(count_value) with label Count Series: date Breakdowns: name Customize Tab Chart Options Stacked Bars: on Sort Bars: on Y Axis Label:Number of Patients (in thousands) X Axis X Axis Label: Years Reduce X ticks: on "],["concepts-browser-deprecated.html", "9.9 Concepts Browser [Deprecated]", " 9.9 Concepts Browser [Deprecated] The concepts browser allows you to search for concepts by name or concept_id in all the data sources you select. No exact number of patients or occurrences are provided but the magnitude of both. CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the “Edit Dashboard” button can show again. Data Source and Domain Filters Figure 9.1: Settings for creating the Data Source and Domain filter charts For the filters to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query SELECT concept_name, domain_id, source.name AS source_name, source.acronym FROM achilles_results JOIN concept ON cast(stratum_1 AS BIGINT) = concept_id INNER JOIN public.data_source AS source ON data_source_id=source.id WHERE analysis_id in ( 201, 401, 601, 701, 801, 901, 1001, 1801, 200, 400, 600, 700, 800, 1800 ) Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: source_name or domain_id Date Filter: off Instant Filtering: on Number of Concepts Figure 9.20: Settings for creating the Number of Concepts chart SQL Query Same as Data Source and Domain filters query Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Big Number Time Time range: No filter Query Metric: COUNT_DISTINCT(concept_name) with label Concepts Customize Tab Big Number Font Size: Small Subheader Font Size: Tiny Concept Browser Table {#conceptBrowserTable} Figure 9.21: Settings for creating the Concepts Table chart SELECT q1.concept_id AS concept_id, q1.concept_name AS concept_name, q1.domain_id, source.name AS source_name, source.acronym, sum(q1.count_value) as &quot;Occurrence_count&quot;, sum(q1.count_person) as &quot;Person_count&quot;, CASE WHEN sum(q1.count_value)&lt;=10 THEN &#39;&lt;=10&#39; WHEN sum(q1.count_value)&lt;=100 THEN &#39;11-10ˆ2&#39; WHEN sum(q1.count_value)&lt;=1000 THEN &#39;10ˆ2-10ˆ3&#39; WHEN sum(q1.count_value)&lt;=10000 THEN &#39;10ˆ3-10ˆ4&#39; WHEN sum(q1.count_value)&lt;=100000 THEN &#39;10ˆ4-10ˆ5&#39; WHEN sum(q1.count_value)&lt;=1000000 THEN &#39;10ˆ5-10ˆ6&#39; ELSE &#39;&gt;10ˆ6&#39; END as &quot;magnitude_occurrences&quot;, CASE WHEN sum(q1.count_person)&lt;=10 THEN &#39;&lt;=10&#39; WHEN sum(q1.count_person)&lt;=100 THEN &#39;11-10ˆ2&#39; WHEN sum(q1.count_person)&lt;=1000 THEN &#39;10ˆ2-10ˆ3&#39; WHEN sum(q1.count_person)&lt;=10000 THEN &#39;10ˆ3-10ˆ4&#39; WHEN sum(q1.count_person)&lt;=100000 THEN &#39;10ˆ4-10ˆ5&#39; WHEN sum(q1.count_person)&lt;=1000000 THEN &#39;10ˆ5-10ˆ6&#39; ELSE &#39;&gt;10ˆ6&#39; END AS &quot;magnitude_persons&quot; FROM (SELECT analysis_id, stratum_1 concept_id, data_source_id, concept_name, domain_id, count_value, 0 as count_person FROM achilles_results JOIN concept ON cast(stratum_1 AS BIGINT)=concept_id WHERE analysis_id in ( 201, 301, 401, 601, 701, 801, 901, 1001, 1801 ) UNION (SELECT analysis_id, stratum_1 concept_id, data_source_id, concept_name, domain_id, 0 as count_value, sum(count_value) as count_person FROM achilles_results JOIN concept ON cast(stratum_1 as BIGINT)=concept_id WHERE analysis_id in ( 202, 401, 601, 701, 801, 901, 1001, 1801 ) GROUP BY analysis_id, stratum_1, data_source_id, concept_name, domain_id )) as q1 INNER JOIN public.data_source AS source ON q1.data_source_id=source.id GROUP BY q1.concept_id, q1.concept_name, q1.domain_id, source.name, acronym ORDER BY &quot;Person_count&quot; desc Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Table Time Time range: No filter Query Query Mode: Raw Records Columns: source_name, concept_id, concept_name, domain_id, magnitude_persons, magnitude_occurrences Customize Tab Options Table Timestamps Format: %Y-%m-%d %H:%M:%S | 2019-01-14 01:32:10 Page Length: 50 Search Box: on Emit Filter Events: on "],["provenance-deprecated.html", "9.10 Provenance [Deprecated]", " 9.10 Provenance [Deprecated] This Dashboard shows the provenance of the data in the different data domains. CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the “Edit Dashboard” button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Condition &amp; Drug &amp; Procedure &amp; Device &amp; Measurement &amp; Observation Types {#dataProvenanceCharts} Figure 9.22: Settings for creating the Condition, Drug, Procedure, Device, Measurement and Observation charts SQL query All 6 charts use the same sql query. SELECT source.name, source.acronym, CASE WHEN analysis_id = 405 THEN &#39;Condition&#39; WHEN analysis_id = 605 THEN &#39;Procedure&#39; WHEN analysis_id = 705 THEN &#39;Drug&#39; WHEN analysis_id = 805 THEN &#39;Observation&#39; WHEN analysis_id = 1805 THEN &#39;Measurement&#39; WHEN analysis_id = 2105 THEN &#39;Device&#39; ELSE &#39;Other&#39; END AS domain_name, concept_name, SUM(count_value) AS num_records FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN public.concept AS c1 ON CAST(stratum_2 AS BIGINT) = concept_id WHERE analysis_id IN (405,605,705,805,1805,2105) GROUP BY source.name, source.acronym, concept_name, CASE WHEN analysis_id = 405 THEN &#39;Condition&#39; WHEN analysis_id = 605 THEN &#39;Procedure&#39; WHEN analysis_id = 705 THEN &#39;Drug&#39; WHEN analysis_id = 805 THEN &#39;Observation&#39; WHEN analysis_id = 1805 THEN &#39;Measurement&#39; WHEN analysis_id = 2105 THEN &#39;Device&#39; ELSE &#39;Other&#39; END Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Bar Chart Time Time range: No filter Query Metrics: SUM(num_records) with label Nr Records Filters: domain_name=Condition or domain_name=Drug or domain_name=Procedure or domain_name=Device or domain_name=Measurement or domain_name=Observation Series: name Breakdowns: concept_name Contribution: on Customize Tab Chart Options Stacked Bars: on "],["data-domains-deprecated.html", "9.11 Data Domains [Deprecated]", " 9.11 Data Domains [Deprecated] CSS To hide the dashboard header insert the following css code to the CSS field on the edit page: .dashboard &gt; div:not(.dashboard-content) { /* dashboard header */ display: none; } With this every time you want to edit the dashboard layout you have to either comment the CSS inserted or remove it so the “Edit Dashboard” button can show again. Data Source Filter Figure 9.8: Settings for creating the Data Source filter chart For the filter to work the name of the fields to filter should match in all tables used on the charts of this dashboard. SQL query No SQL query, use the sql table data_source of the achilles database. Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Filter Box Time Time range: No filter Filters Configuration Filters: name Date Filter: off Instant Filtering: on Average Number of Records per Person Figure 9.23: Settings for creating the Data Source filter chart SQL query SELECT source.name, source.acronym, CASE WHEN analysis_id = 201 THEN &#39;Visit&#39; WHEN analysis_id = 401 THEN &#39;Condition&#39; WHEN analysis_id = 501 THEN &#39;Death&#39; WHEN analysis_id = 601 THEN &#39;Procedure&#39; WHEN analysis_id = 701 THEN &#39;Drug Exposure&#39; WHEN analysis_id = 801 THEN &#39;Observation&#39; WHEN analysis_id = 1801 THEN &#39;Measurement&#39; WHEN analysis_id = 2101 THEN &#39;Device&#39; WHEN analysis_id = 2201 THEN &#39;Note&#39; END AS Data_Domain, SUM(count_value) /AVG(num_persons) AS &quot;records_per_person&quot; FROM public.achilles_results AS achilles INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id INNER JOIN ( SELECT data_source_id , count_value as num_persons FROM achilles_results WHERE analysis_id = 1) counts ON achilles.data_source_id = counts.data_source_id GROUP BY analysis_id, source.name, source.acronym HAVING analysis_id IN ( 201, 401, 501, 601, 701, 801, 1801, 2101, 2201 ) Chart settings Data Tab Datasource &amp; Chart Type Visualization Type: Heatmap Time Time range: No filter Query X: name Y: data_domain Metric: AVG(records_per_person) with a label avg records per person Row limit: None Heatmap Options Left Margin: 100 Show Percentage: off "],["404.html", "Page not found", " Page not found The page you requested cannot be found (perhaps it was moved or renamed). You may want to try searching to find the page's new location, or use the table of contents to find the page you are looking for. "]]
diff --git a/docs/src/02-installation.Rmd b/docs/src/02-installation.Rmd
index 952e5806..7da06aef 100644
--- a/docs/src/02-installation.Rmd
+++ b/docs/src/02-installation.Rmd
@@ -14,9 +14,9 @@ Currently, we use docker to deploy our environment
 
 1. Clone the repository with the command `git clone --recurse-submodules https://github.com/EHDEN/NetworkDashboards`. If you already cloned the repository without the `--recurse-submodules` option, run `git submodule update --init` to fetch the superset submodule.
 
-2. Create a `.env` file on the `docker` directory, using `.env-example` as a reference, setting all necessary environment variables (`SUPERSET\_MAPBOX\_API\_KEY` and `DASHBOARD\_VIEWER\_SECRET\_KEY`).
+2. Create a `.env` file on the `docker` directory, using `.env-example` as a reference, setting all necessary environment variables (`SUPERSET_MAPBOX_API_KEY` and `DASHBOARD_VIEWER_SECRET_KEY`).
 
-   2.1 If you will use this application as a third-party application and will iframe it, set the variable `SINGLE\_APPLICATION\_MODE` to `False` and define the host of the main application on the variable `MAIN\_APPLICATION\_HOST`. Also make sure to add this last host to the list of `ALLOWED\_HOSTS`.
+   2.1 If you will use this application as a third-party application and will iframe it, set the variable `SINGLE_APPLICATION_MODE` to `False` and define the host of the main application on the variable `MAIN_APPLICATION_HOST`. Also make sure to add this last host to the list of `ALLOWED_HOSTS`.
 
 ### Dashboard Viewer setup {-}
 
@@ -107,7 +107,7 @@ The concepts table is not in the repository due to its dimension, therefore we u
 4. By default Superset's admin user credentials are admin/admin.
    It is recommended that you change the password if you will use this in a production environment.
 
-5. To any anonymous user view dashboards, add the following:
+5. To any anonymous user view dashboards, add the following permissions to the public role:
 
    - all datasource access on all_datasource_access
    - can csrf token on Superset
@@ -117,6 +117,8 @@ The concepts table is not in the repository due to its dimension, therefore we u
    - can read on CssTemplate
    - can read on Dashboard
 
+6. For each dashboard you want anonymous users to be able to access, on the dashboard list page click edit (the pencil on the right) and add the "Admin" and "Public" roles to the "Roles with acess" field.
+
 ### Dummy data {-}
 
 On a fresh installation, there are no achilles_results data so Superset's dashboards will display "No results". On the root of this repository, you can find the `demo` directory where we have an ACHILLES results file with synthetic data that you can upload to a data source on the uploader app of the dashboard viewer (http://localhost/uploader). If you wish to compare multiple data sources, on the `demo` directory there is also a python script that allows you to generate new ACHILLES results files, where it generates random count values based on the ranges of values for each set of analysis_id and stratums present on a base ACHILLES results file. So, from the one ACHILLES results fill we provided, you can have multiple data sources with different data.
diff --git a/docs/src/03-general.Rmd b/docs/src/03-general.Rmd
index 4a664a1e..e6acd1c0 100644
--- a/docs/src/03-general.Rmd
+++ b/docs/src/03-general.Rmd
@@ -41,7 +41,8 @@ SELECT source.name,
        source.database_type,
        source.acronym
 FROM public.data_source AS source
-INNER JOIN public.country AS country ON source.country_id=country.id
+INNER JOIN public.country AS country
+  ON source.country_id=country.id
 ```
 
 #### Chart settings {-}
@@ -109,8 +110,10 @@ SELECT  source.name AS source,
         concepts.concept_name AS gender,
         achilles.count_value as count
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.country AS country ON source.country_id=country.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.country AS country
+  ON source.country_id=country.id
 JOIN (
   SELECT '8507' AS concept_id, 'Male' AS concept_name
   UNION
@@ -145,15 +148,17 @@ WHERE analysis_id = 2
 knitr::include_graphics("images/03-general/04-patients_per_country.png")
 ```
 
-#### SQL query {#patientsPerCountryQuery} {-}
+#### SQL query {-#patientsPerCountryQuery}
 
 ```sql
 SELECT country.country,
        source.database_type,
        count_value
-FROM public.achilles_results AS achilles 
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.country AS country ON source.country_id=country.id
+FROM public.achilles_results AS achilles
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.country AS country
+  ON source.country_id=country.id
 WHERE analysis_id = 1
 ```
 
@@ -217,7 +222,8 @@ SELECT  name,
         longitude,
         country
 FROM public.data_source AS source
-INNER JOIN public.country AS country ON source.country_id=country.id
+INNER JOIN public.country AS country
+  ON source.country_id=country.id
 ```
 
 #### Chart settings {-}
@@ -252,7 +258,8 @@ SELECT
   stratum_4 as "cdm_version",
   stratum_5 as "vocabulary_version"
 FROM achilles_results
-JOIN data_source ON achilles_results.data_source_id = data_source.id
+JOIN data_source
+  ON achilles_results.data_source_id = data_source.id
 JOIN country ON data_source.country_id = country.id
 WHERE analysis_id=5000
 ```
diff --git a/docs/src/04-person.Rmd b/docs/src/04-person.Rmd
index ee7a3456..c859ee33 100644
--- a/docs/src/04-person.Rmd
+++ b/docs/src/04-person.Rmd
@@ -69,19 +69,39 @@ knitr::include_graphics("images/04-person/02-age_at_first_observation_table.png"
 ```sql
 SELECT source.name,
        source.acronym,
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) < 10 THEN count_value END) AS "0-10",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 10 AND CAST(stratum_2 AS INTEGER) < 20 THEN count_value END) AS "10-20",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 20 AND CAST(stratum_2 AS INTEGER) < 30 THEN count_value END) AS "20-30",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 30 AND CAST(stratum_2 AS INTEGER) < 40 THEN count_value END) AS "30-40",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 40 AND CAST(stratum_2 AS INTEGER) < 50 THEN count_value END) AS "40-50",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 50 AND CAST(stratum_2 AS INTEGER) < 60 THEN count_value END) AS "50-60",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 60 AND CAST(stratum_2 AS INTEGER) < 70 THEN count_value END) AS "60-70",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 70 AND CAST(stratum_2 AS INTEGER) < 80 THEN count_value END) AS "70-80",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 80 AND CAST(stratum_2 AS INTEGER) < 90 THEN count_value END) AS "80-90",
-       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 90 THEN count_value END) AS "90+"
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) < 10
+         THEN count_value END) AS "0-10",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 10
+         AND CAST(stratum_2 AS INTEGER) < 20
+         THEN count_value END) AS "10-20",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 20
+         AND CAST(stratum_2 AS INTEGER) < 30
+         THEN count_value END) AS "20-30",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 30
+         AND CAST(stratum_2 AS INTEGER) < 40
+         THEN count_value END) AS "30-40",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 40
+         AND CAST(stratum_2 AS INTEGER) < 50
+         THEN count_value END) AS "40-50",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 50
+         AND CAST(stratum_2 AS INTEGER) < 60
+         THEN count_value END) AS "50-60",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 60
+         AND CAST(stratum_2 AS INTEGER) < 70
+         THEN count_value END) AS "60-70",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 70
+         AND CAST(stratum_2 AS INTEGER) < 80
+         THEN count_value END) AS "70-80",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 80
+         AND CAST(stratum_2 AS INTEGER) < 90
+         THEN count_value END) AS "80-90",
+       SUM(CASE WHEN CAST(stratum_2 AS INTEGER) >= 90
+         THEN count_value END) AS "90+"
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.concept
+  ON CAST(stratum_1 AS BIGINT) = concept_id
 WHERE analysis_id = 102
 GROUP BY name, acronym
 ```
@@ -114,7 +134,8 @@ SELECT source.name,
     count_value AS count, 
     source.acronym
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 101
 ```
 
@@ -152,7 +173,8 @@ SELECT source.name,
        stratum_1 AS "Birth_year",
        count_value AS count
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 3
 ```
 
@@ -192,7 +214,8 @@ SELECT source.name,
        count_value AS Number_of_persons,
        source.acronym
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 JOIN (
   SELECT '8507' AS concept_id, 'Male' AS concept_name
   UNION
diff --git a/docs/src/05-observation_period.Rmd b/docs/src/05-observation_period.Rmd
index a9bec3c8..cc112e2a 100644
--- a/docs/src/05-observation_period.Rmd
+++ b/docs/src/05-observation_period.Rmd
@@ -48,7 +48,7 @@ No SQL query, use the sql table `data_source` of the `achilles` database.
     - Date Filter: off
     - Instant Filtering: on
 
-### Number of Patients in Observation Period {#numInObservationPeriod} {-}
+### Number of Patients in Observation Period {-#numInObservationPeriod}
 
 The Number of Patients in Observation Period plot shows the number of patients that contribute at least one day in a specific month.
 
@@ -64,7 +64,8 @@ SELECT source.name,
        to_date(stratum_1, 'YYYYMM') as Date,
        count_value
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 110
 ```
 
@@ -102,7 +103,8 @@ SELECT source.name,
        to_date(stratum_1, 'YYYYMM') AS year_month,
        count_value
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 111
 ```
 
@@ -140,7 +142,8 @@ SELECT source.name,
        to_date(stratum_1, 'YYYYMM') AS year_month,
        count_value
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 112
 ```
 
diff --git a/docs/src/06-visit.Rmd b/docs/src/06-visit.Rmd
index fb195841..3775fc13 100644
--- a/docs/src/06-visit.Rmd
+++ b/docs/src/06-visit.Rmd
@@ -50,7 +50,7 @@ No SQL query, use the sql table `data_source` of the `achilles` database.
     - Date Filter: off
     - Instant Filtering: on
 
-### Visit Type Table {#visitTypeTable} {-}
+### Visit Type Table {-#visitTypeTable}
 
 ```{r visitTypeTable, fig.cap="Settings for creating the Visit Type Table chart",echo=FALSE, out.width="100%"}
 knitr::include_graphics("images/06-visit/02-visit_types_table.png")
@@ -64,8 +64,10 @@ SELECT source.name,
        concept_name AS "Type",
        MAX(count_value) AS "Count"
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.concept
+  ON CAST(stratum_1 AS BIGINT) = concept_id
 WHERE analysis_id = 201
 GROUP BY name, acronym, "Type"
 ORDER BY "Count" DESC
@@ -96,8 +98,10 @@ SELECT source.name,
        concept_name AS "Observation", 
        count_value
 FROM public.achilles_results AS achilles 
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.concept ON CAST(stratum_1 AS BIGINT) = concept_id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.concept
+  ON CAST(stratum_1 AS BIGINT) = concept_id
 WHERE analysis_id = 201
 ```
 
diff --git a/docs/src/07-death.Rmd b/docs/src/07-death.Rmd
index 0269e2fa..9205e39c 100644
--- a/docs/src/07-death.Rmd
+++ b/docs/src/07-death.Rmd
@@ -61,7 +61,8 @@ SELECT source.name,
     count_value,
     source.acronym
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 501
 ```
 
@@ -96,7 +97,8 @@ SELECT source.name,
     EXTRACT(year FROM TO_DATE(stratum_1, 'YYYYMM')) AS Date,
     count_value
 FROM public.achilles_results as achilles
-INNER JOIN public.data_source as source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source as source
+  ON achilles.data_source_id=source.id
 WHERE analysis_id = 502
 ```
 
diff --git a/docs/src/08-concepts_browser.Rmd b/docs/src/08-concepts_browser.Rmd
index 35a8d84f..58257ce5 100644
--- a/docs/src/08-concepts_browser.Rmd
+++ b/docs/src/08-concepts_browser.Rmd
@@ -38,10 +38,15 @@ SELECT concept_name,
      domain_id,
      source.name AS source_name,
      source.acronym
-FROM achilles_results
-JOIN concept ON cast(stratum_1 AS BIGINT) = concept_id
-INNER JOIN public.data_source AS source ON data_source_id=source.id
-WHERE analysis_id in (201, 401, 601, 701, 801, 901, 1001, 1801, 200, 400, 600, 700, 800, 1800)
+FROM achilles_results JOIN concept
+  ON cast(stratum_1 AS BIGINT) = concept_id
+INNER JOIN public.data_source AS source
+  ON data_source_id=source.id
+WHERE
+  analysis_id in (
+    201, 401, 601, 701, 801, 901, 1001, 1801,
+    200, 400, 600, 700, 800, 1800
+  )
 ```
 
 #### Chart settings {-}
@@ -97,21 +102,33 @@ SELECT
     sum(q1.count_value) as "Occurrence_count",
     sum(q1.count_person) as "Person_count",
     CASE 
-        WHEN sum(q1.count_value)<=10 THEN '<=10'
-        WHEN sum(q1.count_value)<=100 THEN '11-10ˆ2'
-        WHEN sum(q1.count_value)<=1000 THEN '10ˆ2-10ˆ3'
-        WHEN sum(q1.count_value)<=10000 THEN '10ˆ3-10ˆ4'
-        WHEN sum(q1.count_value)<=100000 THEN '10ˆ4-10ˆ5'
-        WHEN sum(q1.count_value)<=1000000 THEN '10ˆ5-10ˆ6'
+        WHEN sum(q1.count_value)<=10
+          THEN '<=10'
+        WHEN sum(q1.count_value)<=100
+          THEN '11-10ˆ2'
+        WHEN sum(q1.count_value)<=1000
+          THEN '10ˆ2-10ˆ3'
+        WHEN sum(q1.count_value)<=10000
+          THEN '10ˆ3-10ˆ4'
+        WHEN sum(q1.count_value)<=100000
+          THEN '10ˆ4-10ˆ5'
+        WHEN sum(q1.count_value)<=1000000
+          THEN '10ˆ5-10ˆ6'
         ELSE '>10ˆ6'
     END as "magnitude_occurrences",
     CASE 
-        WHEN sum(q1.count_person)<=10 THEN '<=10'
-        WHEN sum(q1.count_person)<=100 THEN '11-10ˆ2'
-        WHEN sum(q1.count_person)<=1000 THEN '10ˆ2-10ˆ3'
-        WHEN sum(q1.count_person)<=10000 THEN '10ˆ3-10ˆ4'
-        WHEN sum(q1.count_person)<=100000 THEN '10ˆ4-10ˆ5'
-        WHEN sum(q1.count_person)<=1000000 THEN '10ˆ5-10ˆ6'
+        WHEN sum(q1.count_person)<=10
+          THEN '<=10'
+        WHEN sum(q1.count_person)<=100
+          THEN '11-10ˆ2'
+        WHEN sum(q1.count_person)<=1000
+          THEN '10ˆ2-10ˆ3'
+        WHEN sum(q1.count_person)<=10000
+          THEN '10ˆ3-10ˆ4'
+        WHEN sum(q1.count_person)<=100000
+          THEN '10ˆ4-10ˆ5'
+        WHEN sum(q1.count_person)<=1000000
+          THEN '10ˆ5-10ˆ6'
         ELSE '>10ˆ6'
     END AS "magnitude_persons"
 FROM (SELECT analysis_id,
@@ -121,8 +138,13 @@ FROM (SELECT analysis_id,
              domain_id,
              count_value, 0 as count_person
     FROM achilles_results
-    JOIN concept ON cast(stratum_1 AS BIGINT)=concept_id
-    WHERE analysis_id in (201, 301, 401, 601, 701, 801, 901, 1001, 1801)
+    JOIN concept
+      ON cast(stratum_1 AS BIGINT)=concept_id
+    WHERE
+      analysis_id in (
+        201, 301, 401, 601, 701, 801, 901, 1001,
+        1801
+      )
     UNION (SELECT  analysis_id,
                    stratum_1 concept_id,
                    data_source_id,
@@ -131,11 +153,27 @@ FROM (SELECT analysis_id,
                    0 as count_value,
                    sum(count_value) as count_person
             FROM  achilles_results
-            JOIN concept on cast(stratum_1 as BIGINT)=concept_id
-            WHERE analysis_id in (202, 401, 601, 701, 801, 901, 1001, 1801)
-            GROUP BY analysis_id,stratum_1,data_source_id,concept_name,domain_id) ) as q1
-    INNER JOIN public.data_source AS source ON q1.data_source_id=source.id
-GROUP BY q1.concept_id,q1.concept_name,q1.domain_id,source.name, acronym
+            JOIN concept
+              ON cast(stratum_1 as BIGINT)=concept_id
+            WHERE
+              analysis_id in (
+                202, 401, 601, 701, 801, 901, 1001, 1801
+              )
+            GROUP BY
+              analysis_id,
+              stratum_1,
+              data_source_id,
+              concept_name,
+              domain_id
+            )) as q1
+    INNER JOIN public.data_source AS source
+      ON q1.data_source_id=source.id
+GROUP BY
+  q1.concept_id,
+  q1.concept_name,
+  q1.domain_id,
+  source.name,
+  acronym
 ORDER BY "Person_count" desc
 ```
 
diff --git a/docs/src/09-provenance.Rmd b/docs/src/09-provenance.Rmd
index a70680dc..4f3f84c0 100644
--- a/docs/src/09-provenance.Rmd
+++ b/docs/src/09-provenance.Rmd
@@ -61,18 +61,26 @@ All 6 charts use the same sql query.
 ```sql
 SELECT source.name,
     source.acronym,
-    CASE WHEN analysis_id = 405 THEN 'Condition'
-    WHEN analysis_id = 605 THEN 'Procedure'
-    WHEN analysis_id = 705 THEN 'Drug'
-    WHEN analysis_id = 805 THEN 'Observation'
-    WHEN analysis_id = 1805 THEN 'Measurement'
-    WHEN analysis_id = 2105 THEN 'Device'
+    CASE WHEN analysis_id = 405
+      THEN 'Condition'
+    WHEN analysis_id = 605
+      THEN 'Procedure'
+    WHEN analysis_id = 705
+      THEN 'Drug'
+    WHEN analysis_id = 805
+      THEN 'Observation'
+    WHEN analysis_id = 1805
+      THEN 'Measurement'
+    WHEN analysis_id = 2105
+      THEN 'Device'
     ELSE 'Other' END AS domain_name,
     concept_name,
     SUM(count_value) AS num_records
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
-INNER JOIN public.concept AS c1 ON CAST(stratum_2 AS BIGINT) = concept_id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
+INNER JOIN public.concept AS c1
+  ON CAST(stratum_2 AS BIGINT) = concept_id
 WHERE analysis_id IN (405,605,705,805,1805,2105)
 GROUP BY source.name, source.acronym, concept_name, 
     CASE WHEN analysis_id = 405 THEN 'Condition'
diff --git a/docs/src/10-data_domains.Rmd b/docs/src/10-data_domains.Rmd
index 73f6bc53..8e3d312a 100644
--- a/docs/src/10-data_domains.Rmd
+++ b/docs/src/10-data_domains.Rmd
@@ -48,7 +48,7 @@ No SQL query, use the sql table `data_source` of the `achilles` database.
     - Date Filter: off
     - Instant Filtering: on
 
-### Average Number of Records per Person {#avgRecordsPerPerson} {-}
+### Average Number of Records per Person {-#avgRecordsPerPerson}
 
 ```{r , fig.cap="Settings for creating the Data Source filter chart",echo=FALSE, out.width="100%"}
 knitr::include_graphics("images/10-data_domain/02-avg_records_per_person.png")
@@ -61,25 +61,41 @@ SELECT
     source.name,
     source.acronym,
     CASE 
-    WHEN analysis_id = 201 THEN 'Visit'
-    WHEN analysis_id = 401 THEN 'Condition'
-    WHEN analysis_id = 501 THEN 'Death'
-    WHEN analysis_id = 601 THEN 'Procedure'
-    WHEN analysis_id = 701 THEN 'Drug Exposure'
-    WHEN analysis_id = 801 THEN 'Observation'
-    WHEN analysis_id = 1801 THEN 'Measurement'
-    WHEN analysis_id = 2101 THEN 'Device'
-    WHEN analysis_id = 2201 THEN 'Note'
+    WHEN analysis_id = 201
+      THEN 'Visit'
+    WHEN analysis_id = 401
+      THEN 'Condition'
+    WHEN analysis_id = 501
+      THEN 'Death'
+    WHEN analysis_id = 601
+      THEN 'Procedure'
+    WHEN analysis_id = 701
+      THEN 'Drug Exposure'
+    WHEN analysis_id = 801
+      THEN 'Observation'
+    WHEN analysis_id = 1801
+      THEN 'Measurement'
+    WHEN analysis_id = 2101
+      THEN 'Device'
+    WHEN analysis_id = 2201
+      THEN 'Note'
     END AS Data_Domain,
-    SUM(count_value) /AVG(num_persons) AS "records_per_person"
+    SUM(count_value) /AVG(num_persons)
+      AS "records_per_person"
 FROM public.achilles_results AS achilles
-INNER JOIN public.data_source AS source ON achilles.data_source_id=source.id
+INNER JOIN public.data_source AS source
+  ON achilles.data_source_id=source.id
 INNER JOIN (
   SELECT data_source_id , count_value as num_persons
   FROM achilles_results
-  WHERE analysis_id = 1) counts ON achilles.data_source_id = counts.data_source_id 
+  WHERE analysis_id = 1) counts
+    ON achilles.data_source_id = counts.data_source_id
 GROUP BY analysis_id, source.name, source.acronym
-HAVING analysis_id IN (201, 401, 501, 601, 701, 801, 1801, 2101, 2201)
+HAVING
+  analysis_id IN (
+    201, 401, 501, 601, 701, 801, 1801, 2101,
+    2201
+  )
 ```
 
 #### Chart settings {-}
diff --git a/docs/src/DataNetworkDashboards.rds b/docs/src/DataNetworkDashboards.rds
index 0084ee79..16311c72 100644
Binary files a/docs/src/DataNetworkDashboards.rds and b/docs/src/DataNetworkDashboards.rds differ
diff --git a/docs/src/backups.Rmd b/docs/src/backups.Rmd
index 82c6c507..94914c9f 100644
--- a/docs/src/backups.Rmd
+++ b/docs/src/backups.Rmd
@@ -2,7 +2,7 @@
 
 1. Create a credentials file (the structure of the file depends on the target cloud server)
 
-2. Create a `.dashboards_backups.conf` file under your home directory (variable `$HOME`) using `dashboards_backups.conf.example` as base, setting the appropriate value for the several variables.
+2. Create a `backups.conf` under the `backups` directory using `backups.conf.example` as base, setting the appropriate value for the several variables.
    
    For variables associated with files and directories always use *absolute* paths.
    
@@ -50,56 +50,16 @@
    
    2. Add entry `0 3 * * * $HOME/NetworkDashboards/backups/backup.sh` (The path to the backup script might be different)
 
-## Restore
+### Restore {-}
 
-1. Select the compressed backup you want to restore and decompress it:
-   
-   `tar -xJf BACKUP_FILE.tar.xz`.
+1. Select the compressed backup you want to restore.
 
-2. 1. **Redis**
-      
-      1. Make sure the redis docker container is down.
-      
-      2. (Re)place the file `dump.rdb` on the redis volume by the file `redis.rdb`. By default the redis volume is located where this repository was cloned on the directory `docker/volumes/redis`.
-      
-      3. Change its permissions, owner and group:
-         
-         ```shell
-         chmod 0644 docker/volumes/redis/dump.rdb
-         sudo chown -R 999:999 docker/volumes/redis
-         ```
-   
-   2. **Postgres**
-      
-      1. Make sure all containers that make changes on the database are stopped.
-      
-      2. Copy the file `postgres_backup.sql` into the postgres container
-         
-         `docker cp postgres.sql [CONTAINER_ID]:/tmp`.
-      
-      5. Execute the backup script:
-         
-         `docker exec -u root dashboard_viewer_postgres_1 psql -f /tmp/postgres_backup.sql -U \$POSTGRES_USER -d \$POSTGRES_DB`.
-   
-   3. **Media Files** If you have a volume pointing to where the media files are stored, replace all files with the ones present on the downloaded backup file. Else:
-   
-      1. Bring the dashoard container up `docker-compose up -d dashboard`
-      
-      2. Enter in the container `docker exec -it [CONTAINER_ID] bash`
-      
-      3. If you don't know where the media files are stored you can check the value of the MEDIA_ROOT variable
-         
-         1. `python manage.py shell`
-         
-         2. `from django.conf import settings`
-         
-         3. `print(settings.MEDIA_ROOT)`
-      
-      4. Remove the entire MEDIA_ROOT directory and exit the container
-      
-      5. Copy the media directory present on the backup file to the catalogue container `docker cp -a collected-media [CONTAINER_ID]:[MEDIA_ROOT_PARENT_PATH]`
+2. Make sure that all the environment variables are the same as the ones that were used for the chosen backup file.
+   Additionally, the `backups.conf` file is also necessary to set up, since the `TMP_DIRECTORY` variable will be used.
+
+3. Run the `backups/restore.sh` script.
 
-## Useful stuff
+### Useful stuff {-}
 
 - How to create a shared link to a dropbox directory using its python's API:
 
@@ -113,8 +73,14 @@
 
    # create a shared link for a directory
    from dropbox.sharing import SharedLinkSettings
-   sharing_settings = SharedLinkSettings(require_password=True, link_password=DIRECTORY_PASSWORD)
-   d.sharing_create_shared_link_with_settings(DIRECTORY_PATH, sharing_settings)
+   sharing_settings = SharedLinkSettings(
+       require_password=True,
+       link_password=DIRECTORY_PASSWORD,
+   )
+   d.sharing_create_shared_link_with_settings(
+       DIRECTORY_PATH,
+       sharing_settings,
+   )
 
    # get all links
    for link in d.sharing_get_shared_links().links:
diff --git a/docs/src/code-documentation.Rmd b/docs/src/code-documentation.Rmd
index 896a05c4..19fb782f 100644
--- a/docs/src/code-documentation.Rmd
+++ b/docs/src/code-documentation.Rmd
@@ -42,7 +42,7 @@ Once again to avoid timeouts, such operations are executed on a background task.
 
 Currently, this app is not being used and the URL mapping was delete.
 To use it again uncomment the tabsManager [line](https://github.com/EHDEN/NetworkDashboards/blob/master/dashboard_viewer/dashboard_viewer/urls.py#L29) on the dashboard_viewer/dashboard_viewer/urls.py file.
-Then you can access the tabs page through the `[BASE_RUL]/tabs/` URL.
+Then you can access the tabs page through the `[BASE_URL]/tabs/` URL.
 
 <h5>Views</h5>
 
diff --git a/docs/src/development.Rmd b/docs/src/development.Rmd
index df5ecc67..7aca10fd 100644
--- a/docs/src/development.Rmd
+++ b/docs/src/development.Rmd
@@ -33,57 +33,31 @@
 
 ### Superset {-}
 
-Currently, we have a custom chart plugin on our superset installation which doesn't allow us to use superset's pre-built images available on their docker hub, since we have to call npm's build procedures on the front-end code.
-To build our custom docker image we used superset's [Dockerfile](https://github.com/apache/superset/blob/1.0.1/Dockerfile) as a base, where we removed the Dev section and added some code to install our chart plugins before building the front-end code.
-Also, to make Superset import our custom chart plugins, some changes have to be made to the [superset-frontend/src/visualizations/presets/MainPreset.js](https://github.com/apache/superset/blob/1.0.1/superset-frontend/src/visualizations/presets/MainPreset.js) file.
+Currently, we have made some modifications to the box plot visualization on our superset installation which doesn't allow us to use superset's pre-built images available on their docker hub, since we have to call npm's build procedures on the front-end code.
+To build our custom docker image we used superset's [Dockerfile](https://github.com/apache/superset/blob/1.5.0/Dockerfile) as a base, where we removed the Dev section and added some code to install our chart plugins before building the front-end code.
 
-The changes made to the Dockerfile to install the chart plugins are in [this](https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L44-L63) area:
+The changes made to the Dockerfile to install the chart plugins are in [this](https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L47-L49) area:
 
-1. L44: First we copy the `superset/plugins` directory into the container, which contains all the extra and custom chart plugins.
-2. L48-51: Then we iterate over the chart plugins and execute `npm install ...` on each of them.
-   This will make changes to both the package.json and package-lock.json files and for that, we copy them into a temporary directory `package_json_files`.
-3. L54: Then all superset's front-end code is copied into the container, which will override the package*.json files.
-4. L56: After this, we copy our custom MainPresets.js file.
-5. L60-L63: Finally, we replace the package*.json files with the ones that we saved earlier and then run the npm build command.
+1. L46: Repalce some boxplot fiels with ours;
+2. L47: Superset's original version of the controlPanel.ts file is a `.ts` versions however ours is a `.tsx`. For that, we have to remove the `.ts` version to properly override this file.
 
 #### Update Superset {-}
 
 1. `cd` into superset's submodule directory.
 
-2. Get the latest tags: `git fetch`.
+2. Get the latest tags: `git fetch -t`.
 
 3. Checkout to the new desired release tag.
 
 4. Check if there are any changes made to superset's Dockerfile (on the root of the repository for the current latest release), adapt them, and insert them on our custom Dockerfile under the `docker/superset` directory.
 
-5. Check if there are any changes made to superset's `superset-frontend/src/visualizations/presets/MainPreset.js` file.
-   You can use the script `mainpreset_has_changes.py` under the `plugins` directory to check that.
-   Apply the new changes, if any, and remember to keep our chart plugins imported and registered (Currently we only have the *Box plot* plugin).
-
-6. If the version of the frontend package `@superset-ui/plugin-chart-echarts` changed it's necessary to update our box plot plugin.
-   Follow the instructions present [here](https://github.com/EHDEN/NetworkDashboards/tree/master/superset/plugins/plugins/plugin-chart-box-plot#how-to-update), also take into account the instruction of the next section.
+6. If the version of the plugin package `plugin-chart-echarts` changed, it's necessary to update our box plot plugin. If it is greater than 0.18.25, go to the history (`https://github.com/apache/superset/commits/[RELEASE-TAG]/superset-frontend/plugins/plugin-chart-echarts`) of commits done to the plugin-chart-echarts plugin update to the most recent commit, applying their changes to the files in the `superset/box-plot-overrides` directory. A fast way check the changes done between two commits: `git diff [old_commit_hash] [recent_commit_hash] -- superset-frontend/plugins/plugin-chart-echarts`
 
 #### Chart Plugin Development {-}
 
-Instructions on how you can set up your development environment to develop on a custom superset chart plugin:
-
-1. Clone the [superset](https://github.com/apache/superset) repository.
-   **IMPORTANT NOTE**: Since we build the superset's docker image using the existing superset's submodule, it's better not to use it to develop the plugins.
-   If you decide to use it anyways, remember [this](https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L54) and [this](https://github.com/EHDEN/NetworkDashboards/blob/master/docker/superset/Dockerfile#L99) steps.
-   They might override directories (`superset-frontend/node_modules` and `superset/static/assets`) that are generated during the build process, which can cause frontend compilation errors or the app can serve outdated static files.
-
-2. Clone the [superset-ui](https://github.com/apache-superset/superset-ui) repository into the directory superset-frontend of superset's repository.
-
-1. Follow the instructions of [this tutorial](https://superset.apache.org/docs/installation/building-custom-viz-plugins) to create the necessary base files of your plugin.
+1. Follow the instructions of [this tutorial](https://superset.apache.org/docs/contributing/creating-viz-plugins) to create the necessary base files of your plugin.
 
-2. Copy the file `MainPreset.js` present on this directory into the superset repository into the `superset-frontend/src/visualizations/presets/` directory.
-
-3. Add the line `npm install -f --no-optional --save ./superset-frontend/superset-ui/plugins/plugin-chart-[your-chart-name]` into the file `docker/docker-frontend.sh` of the superset repository before the existing `npm install ...` commands.
-
-4. When the development is finished, on the root of the superset-ui repository run `yarn install` and then `yarn build [your-chart-name]`.
-
-5. Copy the directory of your plugin (including its sub-directory `esm`), within the superset-ui repository within the directory `plugins`, into the sub-directory `plugins` this directory.
-   Make sure to run the command `yarn build [your-chart-name]` before doing this step.
+2. To deploy you can either use the `DYNAMIC_PLUGINS` feature flag or you can add and build your plugins in `superset/Dockerfile`.
 
 #### Important features {-}
 
@@ -93,6 +67,7 @@ Instructions on how you can set up your development environment to develop on a
 2. Filters:
   - check [this](https://superset.apache.org/docs/frequently-asked-questions#how-to-add-dynamic-filters-to-a-dashboard) faq entry
   - Append `?preselect_filters={"chartId":{"columnToFilterBy":["value1", "value2"]}}` to the dashboard URL to apply a filter once the dashboard is loaded. E.g. `?preselect_filters={"13":{"name":["Demo University of Aveiro"]}}`
+
 3. Custom label colors: check [this](https://superset.apache.org/docs/frequently-asked-questions#is-there-a-way-to-force-the-use-specific-colors) faq entry
 
 ### Github Actions {-}
diff --git a/docs/src/materialized-views.Rmd b/docs/src/materialized-views.Rmd
index fb7d069f..bf3f3c71 100644
--- a/docs/src/materialized-views.Rmd
+++ b/docs/src/materialized-views.Rmd
@@ -17,11 +17,12 @@ SELECT data_source.acronym,
     JOIN data_source ON ((a.data_source_id = data_source.id)))
     JOIN country ON ((data_source.country_id = country.id)))
     JOIN ( SELECT achilles_results.count_value,
-           achilles_results.data_source_id,
-           achilles_results.stratum_2,
-           achilles_results.stratum_3
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = 0)) p ON ((p.data_source_id = data_source.id)))
+            achilles_results.data_source_id,
+            achilles_results.stratum_2,
+            achilles_results.stratum_3
+           FROM achilles_results
+           WHERE (achilles_results.analysis_id = 0)) p
+      ON p.data_source_id = data_source.id)
  WHERE (a.analysis_id = 5000);
 ```
 
@@ -31,9 +32,10 @@ SELECT data_source.acronym,
 SELECT country.country,
    source.database_type,
    achilles.count_value
-  FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
-    JOIN country country ON ((source.country_id = country.id)))
+  FROM (
+    (achilles_results achilles JOIN data_source source
+      ON (achilles.data_source_id = source.id))
+    JOIN country country ON source.country_id = country.id)
  WHERE (achilles.analysis_id = 1);
 ```
 
@@ -45,8 +47,8 @@ SELECT achilles_results.count_value,
    data_source.acronym,
    data_source.database_type,
    country.country
-  FROM ((achilles_results
-    JOIN data_source ON ((achilles_results.data_source_id = data_source.id)))
+  FROM ((achilles_results JOIN data_source
+      ON ((achilles_results.data_source_id = data_source.id)))
     JOIN country ON ((data_source.country_id = country.id)))
  WHERE (achilles_results.analysis_id = 1);
 ```
@@ -61,9 +63,11 @@ SELECT source.name,
    concept.concept_name AS gender,
    achilles.count_value
   FROM (((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
-    JOIN concept ON ((achilles.stratum_1 = (concept.concept_id)::text)))
+    JOIN concept
+      ON ((achilles.stratum_1 = (concept.concept_id)::text)))
  WHERE (achilles.analysis_id = 2);
 ```
 
@@ -75,61 +79,107 @@ SELECT source.name,
    source.database_type,
    country.country,
    sum(
-       CASE
-           WHEN ((achilles.stratum_2)::integer < 10) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "0-10",
+     CASE WHEN (
+       (achilles.stratum_2):: integer < 10
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "0-10", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 10) AND ((achilles.stratum_2)::integer < 20)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "10-20",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 10
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 20
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "10-20", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 20) AND ((achilles.stratum_2)::integer < 30)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "20-30",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 20
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 30
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "20-30", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 30) AND ((achilles.stratum_2)::integer < 40)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "30-40",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 30
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 40
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "30-40", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 40) AND ((achilles.stratum_2)::integer < 50)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "40-50",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 40
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 50
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "40-50", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 50) AND ((achilles.stratum_2)::integer < 60)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "50-60",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 50
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 60
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "50-60", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 60) AND ((achilles.stratum_2)::integer < 70)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "60-70",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 60
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 70
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "60-70", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 70) AND ((achilles.stratum_2)::integer < 80)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "70-80",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 70
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 80
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "70-80", 
    sum(
-       CASE
-           WHEN (((achilles.stratum_2)::integer >= 80) AND ((achilles.stratum_2)::integer < 90)) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "80-90",
+     CASE WHEN (
+       (
+         (achilles.stratum_2):: integer >= 80
+       ) 
+       AND (
+         (achilles.stratum_2):: integer < 90
+       )
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "80-90", 
    sum(
-       CASE
-           WHEN ((achilles.stratum_2)::integer >= 90) THEN achilles.count_value
-           ELSE NULL::bigint
-       END) AS "90+"
+     CASE WHEN (
+       (achilles.stratum_2):: integer >= 90
+     ) THEN achilles.count_value ELSE NULL :: bigint END
+   ) AS "90+" 
   FROM (((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
-    JOIN concept ON ((achilles.stratum_1 = (concept.concept_id)::text)))
+    JOIN concept
+      ON ((achilles.stratum_1 = (concept.concept_id)::text)))
  WHERE (achilles.analysis_id = 102)
- GROUP BY source.name, source.acronym, source.database_type, country.country;
+ GROUP BY 
+   source.name, 
+   source.acronym, 
+   source.database_type, 
+   country.country;
 ```
 
 ### age1observation_bar_chart {-}
@@ -142,7 +192,8 @@ SELECT source.name,
    source.database_type,
    country.country
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON achilles.data_source_id = source.id)
     JOIN country ON ((country.id = source.country_id)))
  WHERE (achilles.analysis_id = 101);
 ```
@@ -162,7 +213,8 @@ SELECT source.name,
    achilles.max_value,
    achilles.min_value
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((source.country_id = country.id)))
  WHERE (achilles.analysis_id = 103)
  ORDER BY source.name;
@@ -178,7 +230,8 @@ SELECT source.name,
    achilles.stratum_1 AS "Birth_year",
    achilles.count_value AS count
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
  WHERE (achilles.analysis_id = 3);
 ```
@@ -191,27 +244,58 @@ SELECT source.name,
    source.database_type,
    country.country,
        CASE
-           WHEN (achilles.analysis_id = 201) THEN 'Visit'::text
-           WHEN (achilles.analysis_id = 401) THEN 'Condition'::text
-           WHEN (achilles.analysis_id = 501) THEN 'Death'::text
-           WHEN (achilles.analysis_id = 601) THEN 'Procedure'::text
-           WHEN (achilles.analysis_id = 701) THEN 'Drug Exposure'::text
-           WHEN (achilles.analysis_id = 801) THEN 'Observation'::text
-           WHEN (achilles.analysis_id = 1801) THEN 'Measurement'::text
-           WHEN (achilles.analysis_id = 2101) THEN 'Device'::text
-           WHEN (achilles.analysis_id = 2201) THEN 'Note'::text
+           WHEN (achilles.analysis_id = 201)
+             THEN 'Visit'::text
+           WHEN (achilles.analysis_id = 401)
+             THEN 'Condition'::text
+           WHEN (achilles.analysis_id = 501)
+             THEN 'Death'::text
+           WHEN (achilles.analysis_id = 601)
+             THEN 'Procedure'::text
+           WHEN (achilles.analysis_id = 701)
+             THEN 'Drug Exposure'::text
+           WHEN (achilles.analysis_id = 801)
+             THEN 'Observation'::text
+           WHEN (achilles.analysis_id = 1801)
+             THEN 'Measurement'::text
+           WHEN (achilles.analysis_id = 2101)
+             THEN 'Device'::text
+           WHEN (achilles.analysis_id = 2201)
+             THEN 'Note'::text
            ELSE NULL::text
        END AS data_domain,
-   (sum(achilles.count_value) / avg(counts.num_persons)) AS records_per_person
+   (sum(achilles.count_value) / avg(counts.num_persons))
+     AS records_per_person
   FROM (((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
     JOIN ( SELECT achilles_results.data_source_id,
            achilles_results.count_value AS num_persons
           FROM achilles_results
-         WHERE (achilles_results.analysis_id = 1)) counts ON ((achilles.data_source_id = counts.data_source_id)))
- GROUP BY achilles.analysis_id, source.name, source.acronym, source.database_type, country.country
-HAVING (achilles.analysis_id = ANY (ARRAY[(201)::bigint, (401)::bigint, (501)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint, (2201)::bigint]));
+         WHERE (achilles_results.analysis_id = 1)) counts
+           ON achilles.data_source_id = counts.data_source_id)
+ GROUP BY
+   achilles.analysis_id,
+   source.name,
+   source.acronym,
+   source.database_type,
+   country.country
+HAVING
+  (
+    achilles.analysis_id = ANY (
+      ARRAY[(201):: bigint,
+      (401):: bigint,
+      (501):: bigint,
+      (601):: bigint,
+      (701):: bigint,
+      (801):: bigint,
+      (1801):: bigint,
+      (2101):: bigint,
+      (2201):: bigint]
+    )
+  );
+
 ```
 
 ### data_domain_total_num_of_records {-}
@@ -222,23 +306,51 @@ SELECT data_source.name,
    data_source.database_type,
    country.country,
        CASE
-           WHEN (achilles_results.analysis_id = 201) THEN 'Visit'::text
-           WHEN (achilles_results.analysis_id = 401) THEN 'Condition'::text
-           WHEN (achilles_results.analysis_id = 501) THEN 'Death'::text
-           WHEN (achilles_results.analysis_id = 601) THEN 'Procedure'::text
-           WHEN (achilles_results.analysis_id = 701) THEN 'Drug Exposure'::text
-           WHEN (achilles_results.analysis_id = 801) THEN 'Observation'::text
-           WHEN (achilles_results.analysis_id = 1801) THEN 'Measurement'::text
-           WHEN (achilles_results.analysis_id = 2101) THEN 'Device'::text
-           WHEN (achilles_results.analysis_id = 2201) THEN 'Note'::text
+           WHEN (achilles_results.analysis_id = 201)
+             THEN 'Visit'::text
+           WHEN (achilles_results.analysis_id = 401)
+             THEN 'Condition'::text
+           WHEN (achilles_results.analysis_id = 501)
+             THEN 'Death'::text
+           WHEN (achilles_results.analysis_id = 601)
+             THEN 'Procedure'::text
+           WHEN (achilles_results.analysis_id = 701)
+             THEN 'Drug Exposure'::text
+           WHEN (achilles_results.analysis_id = 801)
+             THEN 'Observation'::text
+           WHEN (achilles_results.analysis_id = 1801)
+             THEN 'Measurement'::text
+           WHEN (achilles_results.analysis_id = 2101)
+             THEN 'Device'::text
+           WHEN (achilles_results.analysis_id = 2201)
+             THEN 'Note'::text
            ELSE NULL::text
        END AS data_domain,
    sum(achilles_results.count_value) AS count
   FROM ((achilles_results
-    JOIN data_source ON ((achilles_results.data_source_id = data_source.id)))
+    JOIN data_source
+      ON ((achilles_results.data_source_id = data_source.id)))
     JOIN country ON ((country.id = data_source.country_id)))
- GROUP BY data_source.name, data_source.acronym, data_source.database_type, country.country, achilles_results.analysis_id
-HAVING (achilles_results.analysis_id = ANY (ARRAY[(201)::bigint, (401)::bigint, (501)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint, (2201)::bigint]));
+ GROUP BY
+   data_source.name,
+   data_source.acronym,
+   data_source.database_type,
+   country.country,
+   achilles_results.analysis_id
+HAVING
+  (
+    achilles_results.analysis_id = ANY (
+      ARRAY[(201):: bigint,
+      (401):: bigint,
+      (501):: bigint,
+      (601):: bigint,
+      (701):: bigint,
+      (801):: bigint,
+      (1801):: bigint,
+      (2101):: bigint,
+      (2201):: bigint]
+    )
+  );
 ```
 
 ### number_of_distinct_per_person {-}
@@ -249,12 +361,18 @@ SELECT source.name,
    country.country,
    achilles.analysis_id,
        CASE
-           WHEN (achilles.analysis_id = 203) THEN 'Visit'::text
-           WHEN (achilles.analysis_id = 403) THEN 'Condition'::text
-           WHEN (achilles.analysis_id = 603) THEN 'Procedure'::text
-           WHEN (achilles.analysis_id = 703) THEN 'Drug Exposure'::text
-           WHEN (achilles.analysis_id = 803) THEN 'Observation'::text
-           WHEN (achilles.analysis_id = 1803) THEN 'Measurement'::text
+           WHEN (achilles.analysis_id = 203)
+             THEN 'Visit'::text
+           WHEN (achilles.analysis_id = 403)
+             THEN 'Condition'::text
+           WHEN (achilles.analysis_id = 603)
+             THEN 'Procedure'::text
+           WHEN (achilles.analysis_id = 703)
+             THEN 'Drug Exposure'::text
+           WHEN (achilles.analysis_id = 803)
+             THEN 'Observation'::text
+           WHEN (achilles.analysis_id = 1803)
+             THEN 'Measurement'::text
            ELSE NULL::text
        END AS data_domain,
    achilles.count_value,
@@ -266,9 +384,20 @@ SELECT source.name,
    achilles.p90_value AS p90,
    achilles.max_value
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((source.country_id = country.id)))
- WHERE (achilles.analysis_id = ANY (ARRAY[(203)::bigint, (403)::bigint, (603)::bigint, (703)::bigint, (803)::bigint, (183)::bigint]))
+ WHERE
+   (
+     achilles.analysis_id = ANY (
+       ARRAY[(203):: bigint,
+       (403):: bigint,
+       (603):: bigint,
+       (703):: bigint,
+       (803):: bigint,
+       (183):: bigint]
+     )
+   )
  ORDER BY source.name;
 ```
 
@@ -280,29 +409,58 @@ SELECT source.name,
    source.database_type,
    country.country,
        CASE
-           WHEN (achilles.analysis_id = 405) THEN 'Condition'::text
-           WHEN (achilles.analysis_id = 605) THEN 'Procedure'::text
-           WHEN (achilles.analysis_id = 705) THEN 'Drug'::text
-           WHEN (achilles.analysis_id = 805) THEN 'Observation'::text
-           WHEN (achilles.analysis_id = 1805) THEN 'Measurement'::text
-           WHEN (achilles.analysis_id = 2105) THEN 'Device'::text
+           WHEN (achilles.analysis_id = 405)
+             THEN 'Condition'::text
+           WHEN (achilles.analysis_id = 605)
+             THEN 'Procedure'::text
+           WHEN (achilles.analysis_id = 705)
+             THEN 'Drug'::text
+           WHEN (achilles.analysis_id = 805)
+             THEN 'Observation'::text
+           WHEN (achilles.analysis_id = 1805)
+             THEN 'Measurement'::text
+           WHEN (achilles.analysis_id = 2105)
+             THEN 'Device'::text
            ELSE 'Other'::text
        END AS domain_name,
    c1.concept_name,
    sum(achilles.count_value) AS num_records
   FROM (((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
-    JOIN concept c1 ON ((achilles.stratum_2 = (c1.concept_id)::text)))
- WHERE (achilles.analysis_id = ANY (ARRAY[(405)::bigint, (605)::bigint, (705)::bigint, (805)::bigint, (1805)::bigint, (2105)::bigint]))
- GROUP BY source.name, source.acronym, source.database_type, country.country, c1.concept_name,
+    JOIN concept c1
+      ON ((achilles.stratum_2 = (c1.concept_id)::text)))
+ WHERE
+   (
+     achilles.analysis_id = ANY (
+       ARRAY[(405):: bigint,
+       (605):: bigint,
+       (705):: bigint,
+       (805):: bigint,
+       (1805):: bigint,
+       (2105):: bigint]
+     )
+   )
+ GROUP BY
+   source.name,
+   source.acronym,
+   source.database_type,
+   country.country,
+   c1.concept_name,
        CASE
-           WHEN (achilles.analysis_id = 405) THEN 'Condition'::text
-           WHEN (achilles.analysis_id = 605) THEN 'Procedure'::text
-           WHEN (achilles.analysis_id = 705) THEN 'Drug'::text
-           WHEN (achilles.analysis_id = 805) THEN 'Observation'::text
-           WHEN (achilles.analysis_id = 1805) THEN 'Measurement'::text
-           WHEN (achilles.analysis_id = 2105) THEN 'Device'::text
+           WHEN (achilles.analysis_id = 405)
+             THEN 'Condition'::text
+           WHEN (achilles.analysis_id = 605)
+             THEN 'Procedure'::text
+           WHEN (achilles.analysis_id = 705)
+             THEN 'Drug'::text
+           WHEN (achilles.analysis_id = 805)
+             THEN 'Observation'::text
+           WHEN (achilles.analysis_id = 1805)
+             THEN 'Measurement'::text
+           WHEN (achilles.analysis_id = 2105)
+             THEN 'Device'::text
            ELSE 'Other'::text
        END;
 ```
@@ -317,7 +475,8 @@ SELECT source.name,
    to_date(achilles.stratum_1, 'YYYYMM'::text) AS date,
    achilles.count_value AS "Nr_patients"
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((country.id = source.country_id)))
  WHERE (achilles.analysis_id = 110);
 ```
@@ -325,24 +484,60 @@ SELECT source.name,
 ### cumulative_observation_time {-}
 
 ```sql
-SELECT data_source.name,
-   data_source.acronym,
-   data_source.database_type,
-   country.country,
-   cumulative_sums.xlengthofobservation,
-   round((cumulative_sums.cumulative_sum / (totals.total)::numeric), 5) AS ypercentpersons
-  FROM (((( SELECT achilles_results.data_source_id,
-           ((achilles_results.stratum_1)::integer * 30) AS xlengthofobservation,
-           sum(achilles_results.count_value) OVER (PARTITION BY achilles_results.data_source_id ORDER BY (achilles_results.stratum_1)::integer DESC) AS cumulative_sum
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = 108)) cumulative_sums
-    JOIN ( SELECT achilles_results.data_source_id,
-           achilles_results.count_value AS total
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = 1)) totals ON ((cumulative_sums.data_source_id = totals.data_source_id)))
-    JOIN data_source ON ((cumulative_sums.data_source_id = data_source.id)))
-    JOIN country ON ((country.id = data_source.country_id)))
- ORDER BY data_source.name, cumulative_sums.xlengthofobservation;
+SELECT
+  data_source.name,
+  data_source.acronym,
+  data_source.database_type,
+  country.country,
+  cumulative_sums.xlengthofobservation,
+  round(
+    (cumulative_sums.cumulative_sum / (totals.total):: numeric),
+    5
+  ) AS ypercentpersons
+FROM
+  (
+    (
+      (
+        (
+          SELECT
+            achilles_results.data_source_id,
+            (
+              (achilles_results.stratum_1):: integer * 30
+            ) AS xlengthofobservation,
+            sum(achilles_results.count_value) OVER (
+              PARTITION BY achilles_results.data_source_id
+              ORDER BY
+                (achilles_results.stratum_1):: integer DESC
+            ) AS cumulative_sum
+          FROM
+            achilles_results
+          WHERE
+            (
+              achilles_results.analysis_id = 108
+            )
+        ) cumulative_sums
+        JOIN (
+          SELECT
+            achilles_results.data_source_id,
+            achilles_results.count_value AS total
+          FROM
+            achilles_results
+          WHERE
+            (achilles_results.analysis_id = 1)
+        ) totals ON (
+          (
+            cumulative_sums.data_source_id = totals.data_source_id
+          )
+        )
+      )
+      JOIN data_source
+        ON ((cumulative_sums.data_source_id = data_source.id))
+    )
+    JOIN country ON ((country.id = data_source.country_id))
+  )
+ORDER BY
+  data_source.name,
+  cumulative_sums.xlengthofobservation;
 ```
 
 ### number_of_observation_periods {-}
@@ -355,14 +550,22 @@ SELECT ar.data_source_id AS id,
    ar.stratum_1,
    ar.count_value,
    pa.nrpatients AS patients,
-   round((((100)::numeric * (ar.count_value)::numeric) / (pa.nrpatients)::numeric), 2) AS percentage
+   round(
+     (
+       ((100)::numeric * (ar.count_value)::numeric)
+       /
+       (pa.nrpatients)::numeric
+     ),
+     2
+   ) AS percentage
   FROM (((achilles_results ar
     JOIN data_source ds ON ((ds.id = ar.data_source_id)))
     JOIN country ON ((ds.country_id = country.id)))
     JOIN ( SELECT achilles_results.count_value AS nrpatients,
            achilles_results.data_source_id
           FROM achilles_results
-         WHERE (achilles_results.analysis_id = 0)) pa ON ((pa.data_source_id = ds.id)))
+         WHERE (achilles_results.analysis_id = 0)) pa
+           ON ((pa.data_source_id = ds.id)))
  WHERE (ar.analysis_id = 113);
 ```
 
@@ -381,7 +584,8 @@ SELECT source.name,
    achilles.p90_value AS p90,
    achilles.max_value
   FROM ((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
     JOIN country ON ((source.country_id = country.id)))
  WHERE (achilles.analysis_id = 105)
  ORDER BY source.name;
@@ -415,10 +619,17 @@ SELECT data_source.name,
            achilles_results_1.p90_value,
            achilles_results_1.stdev_value
           FROM achilles_results achilles_results_1
-         WHERE (achilles_results_1.analysis_id = 200)) achilles_results
-    JOIN data_source ON ((achilles_results.data_source_id = data_source.id)))
+         WHERE (achilles_results_1.analysis_id = 200)
+         ) achilles_results
+    JOIN data_source
+      ON ((achilles_results.data_source_id = data_source.id)))
     JOIN country ON ((country.id = data_source.country_id)))
-    JOIN concept ON (((achilles_results.stratum_1)::integer = concept.concept_id)));
+    JOIN concept
+      ON
+        (achilles_results.stratum_1)::integer
+        =
+        concept.concept_id
+        );
 ```
 
 ### visit_type_table {-}
@@ -430,8 +641,22 @@ SELECT data_source.name,
    country.country,
    concept.concept_name,
    ar1.count_value AS num_persons,
-   round(((100.0 * (ar1.count_value)::numeric) / (denom.count_value)::numeric), 2) AS percent_persons,
-   round(((1.0 * (ar2.count_value)::numeric) / (ar1.count_value)::numeric), 2) AS records_per_person
+   round(
+     (
+       (100.0 * (ar1.count_value)::numeric)
+       /
+       (denom.count_value)::numeric
+     ),
+     2
+   ) AS percent_persons,
+   round(
+     (
+       (1.0 * (ar2.count_value)::numeric)
+       /
+       (ar1.count_value)::numeric
+     ),
+     2
+   ) AS records_per_person
   FROM (((((( SELECT achilles_results.id,
            achilles_results.analysis_id,
            achilles_results.stratum_1,
@@ -471,7 +696,9 @@ SELECT data_source.name,
            achilles_results.p90_value,
            achilles_results.stdev_value
           FROM achilles_results
-         WHERE (achilles_results.analysis_id = 201)) ar2 ON (((ar1.stratum_1 = ar2.stratum_1) AND (ar1.data_source_id = ar2.data_source_id))))
+         WHERE (achilles_results.analysis_id = 201)) ar2
+           ON (((ar1.stratum_1 = ar2.stratum_1)
+             AND (ar1.data_source_id = ar2.data_source_id))))
     JOIN ( SELECT achilles_results.id,
            achilles_results.analysis_id,
            achilles_results.stratum_1,
@@ -491,86 +718,264 @@ SELECT data_source.name,
            achilles_results.p90_value,
            achilles_results.stdev_value
           FROM achilles_results
-         WHERE (achilles_results.analysis_id = 1)) denom ON ((ar1.data_source_id = denom.data_source_id)))
+         WHERE (achilles_results.analysis_id = 1)) denom
+           ON ((ar1.data_source_id = denom.data_source_id)))
     JOIN data_source ON ((data_source.id = ar1.data_source_id)))
-    JOIN country ON ((country.id = data_source.country_id)))
-    JOIN concept ON (((ar1.stratum_1)::integer = concept.concept_id)))
+    JOIN country
+      ON ((country.id = data_source.country_id)))
+    JOIN concept
+      ON (((ar1.stratum_1)::integer = concept.concept_id)))
  ORDER BY ar1.data_source_id, ar1.count_value DESC;
 ```
 
 ### domain_filter {-}
 
 ```sql
-SELECT concept.concept_name,
-   concept.domain_id,
-   source.name,
-   source.acronym,
-   source.database_type,
-   country.country
-  FROM (((achilles_results
-    JOIN concept ON (((achilles_results.stratum_1)::bigint = concept.concept_id)))
-    JOIN data_source source ON ((achilles_results.data_source_id = source.id)))
-    JOIN country ON ((country.id = source.country_id)))
- WHERE (achilles_results.analysis_id = ANY (ARRAY[(201)::bigint, (401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (901)::bigint, (1001)::bigint, (1801)::bigint, (200)::bigint, (400)::bigint, (600)::bigint, (700)::bigint, (800)::bigint, (1800)::bigint]));
+SELECT
+  concept.concept_name,
+  concept.domain_id,
+  source.name,
+  source.acronym,
+  source.database_type,
+  country.country
+FROM
+  (
+    (
+      (
+        achilles_results
+        JOIN concept ON (
+          (
+            (achilles_results.stratum_1):: bigint
+            =
+            concept.concept_id
+          )
+        )
+      )
+      JOIN data_source source ON (
+        (
+          achilles_results.data_source_id = source.id
+        )
+      )
+    )
+    JOIN country ON (
+      (country.id = source.country_id)
+    )
+  )
+WHERE
+  (
+    achilles_results.analysis_id = ANY (
+      ARRAY[(201):: bigint,
+      (401):: bigint,
+      (601):: bigint,
+      (701):: bigint,
+      (801):: bigint,
+      (901):: bigint,
+      (1001):: bigint,
+      (1801):: bigint,
+      (200):: bigint,
+      (400):: bigint,
+      (600):: bigint,
+      (700):: bigint,
+      (800):: bigint,
+      (1800):: bigint]
+    )
+  );
 ```
 
 ### concept_browser_table3 {-}
 
 ```sql
-SELECT source.name,
-   source.acronym,
-   source.database_type,
-   country.country,
-   (((('<a href="https://athena.ohdsi.org/search-terms/terms/'::text || ar1.concept_id) || '"target="_blank">'::text) || ar1.concept_id) || '</a>'::text) AS concept_id,
-   concept.concept_name,
-   concept.domain_id,
-   (ar1.rc)::integer AS rc,
-   (ar2.drc)::integer AS drc
-  FROM ((((( SELECT achilles_results.data_source_id,
-           achilles_results.analysis_id,
-           achilles_results.stratum_1 AS concept_id,
-           achilles_results.count_value AS rc
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = ANY (ARRAY[(401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint]))) ar1
-    JOIN ( SELECT ar.data_source_id,
-           ar.analysis_id,
-           ar.stratum_1 AS concept_id,
-           ar.count_value AS drc
-          FROM achilles_results ar
-         WHERE (ar.analysis_id = ANY (ARRAY[(430)::bigint, (630)::bigint, (730)::bigint, (830)::bigint, (1830)::bigint, (2130)::bigint]))) ar2 ON (((ar1.concept_id = ar2.concept_id) AND (ar1.data_source_id = ar2.data_source_id))))
-    JOIN data_source source ON ((ar1.data_source_id = source.id)))
-    JOIN country ON ((source.country_id = country.id)))
-    JOIN concept concept ON ((ar1.concept_id = (concept.concept_id)::text)))
- ORDER BY ((ar2.drc)::integer) DESC;
+SELECT
+  source.name,
+  source.acronym,
+  source.database_type,
+  country.country,
+  (
+    (
+      (
+        (
+'<a href="https://athena.ohdsi.org/search-terms/terms/' :: text
+          || ar1.concept_id
+        ) || '"target="_blank">' :: text
+      ) || ar1.concept_id
+    ) || '</a>' :: text
+  ) AS concept_id,
+  concept.concept_name,
+  concept.domain_id,
+  (ar1.rc):: integer AS rc,
+  (ar2.drc):: integer AS drc
+FROM
+  (
+    (
+      (
+        (
+          (
+            SELECT
+              achilles_results.data_source_id,
+              achilles_results.analysis_id,
+              achilles_results.stratum_1 AS concept_id,
+              achilles_results.count_value AS rc
+            FROM
+              achilles_results
+            WHERE
+              (
+                achilles_results.analysis_id = ANY (
+                  ARRAY[(401):: bigint,
+                  (601):: bigint,
+                  (701):: bigint,
+                  (801):: bigint,
+                  (1801):: bigint,
+                  (2101):: bigint]
+                )
+              )
+          ) ar1
+          JOIN (
+            SELECT
+              ar.data_source_id,
+              ar.analysis_id,
+              ar.stratum_1 AS concept_id,
+              ar.count_value AS drc
+            FROM
+              achilles_results ar
+            WHERE
+              (
+                ar.analysis_id = ANY (
+                  ARRAY[(430):: bigint,
+                  (630):: bigint,
+                  (730):: bigint,
+                  (830):: bigint,
+                  (1830):: bigint,
+                  (2130):: bigint]
+                )
+              )
+          ) ar2 ON (
+            (
+              (ar1.concept_id = ar2.concept_id)
+              AND (
+                ar1.data_source_id = ar2.data_source_id
+              )
+            )
+          )
+        )
+        JOIN data_source source ON (
+          (ar1.data_source_id = source.id)
+        )
+      )
+      JOIN country ON (
+        (source.country_id = country.id)
+      )
+    )
+    JOIN concept concept ON (
+      (
+        ar1.concept_id = (concept.concept_id):: text
+      )
+    )
+  )
+ORDER BY
+  (
+    (ar2.drc):: integer
+  ) DESC;
 ```
 
 ### concept_coverage2 {-}
 
 ```sql
-SELECT source.name AS source_name,
-   source.database_type,
-   country.country,
-   (((('<a href="https://athena.ohdsi.org/search-terms/terms/'::text || concept.concept_id) || '" target="_blank">'::text) || concept.concept_id) || '</a>'::text) AS concept_id,
-   concept.concept_name,
-   concept.domain_id,
-   sum((ar1.rc)::integer) AS rc,
-   sum((ar2.drc)::integer) AS drc
-  FROM ((((( SELECT achilles_results.data_source_id,
-           achilles_results.analysis_id,
-           achilles_results.stratum_1 AS concept_id,
-           achilles_results.count_value AS rc
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = ANY (ARRAY[(401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint]))) ar1
-    JOIN ( SELECT ar.data_source_id,
-           ar.analysis_id,
-           ar.stratum_1 AS concept_id,
-           ar.count_value AS drc
-          FROM achilles_results ar
-         WHERE (ar.analysis_id = ANY (ARRAY[(430)::bigint, (630)::bigint, (730)::bigint, (830)::bigint, (1830)::bigint, (2130)::bigint]))) ar2 ON (((ar1.concept_id = ar2.concept_id) AND (ar1.data_source_id = ar2.data_source_id))))
-    JOIN data_source source ON ((ar1.data_source_id = source.id)))
-    JOIN country ON ((country.id = source.country_id)))
-    JOIN concept concept ON ((ar1.concept_id = (concept.concept_id)::text)))
- GROUP BY source.name, source.database_type, country.country, concept.domain_id, concept.concept_id, concept.concept_name;
+SELECT
+  source.name AS source_name,
+  source.database_type,
+  country.country,
+  (
+    (
+      (
+        (
+'<a href="https://athena.ohdsi.org/search-terms/terms/' :: text
+          || concept.concept_id
+        ) || '" target="_blank">' :: text
+      ) || concept.concept_id
+    ) || '</a>' :: text
+  ) AS concept_id,
+  concept.concept_name,
+  concept.domain_id,
+  sum(
+    (ar1.rc):: integer
+  ) AS rc,
+  sum(
+    (ar2.drc):: integer
+  ) AS drc
+FROM
+  (
+    (
+      (
+        (
+          (
+            SELECT
+              achilles_results.data_source_id,
+              achilles_results.analysis_id,
+              achilles_results.stratum_1 AS concept_id,
+              achilles_results.count_value AS rc
+            FROM
+              achilles_results
+            WHERE
+              (
+                achilles_results.analysis_id = ANY (
+                  ARRAY[(401):: bigint,
+                  (601):: bigint,
+                  (701):: bigint,
+                  (801):: bigint,
+                  (1801):: bigint,
+                  (2101):: bigint]
+                )
+              )
+          ) ar1
+          JOIN (
+            SELECT
+              ar.data_source_id,
+              ar.analysis_id,
+              ar.stratum_1 AS concept_id,
+              ar.count_value AS drc
+            FROM
+              achilles_results ar
+            WHERE
+              (
+                ar.analysis_id = ANY (
+                  ARRAY[(430):: bigint,
+                  (630):: bigint,
+                  (730):: bigint,
+                  (830):: bigint,
+                  (1830):: bigint,
+                  (2130):: bigint]
+                )
+              )
+          ) ar2 ON (
+            (
+              (ar1.concept_id = ar2.concept_id)
+              AND (
+                ar1.data_source_id = ar2.data_source_id
+              )
+            )
+          )
+        )
+        JOIN data_source source ON (
+          (ar1.data_source_id = source.id)
+        )
+      )
+      JOIN country ON (
+        (country.id = source.country_id)
+      )
+    )
+    JOIN concept concept ON (
+      (
+        ar1.concept_id = (concept.concept_id):: text
+      )
+    )
+  )
+GROUP BY
+  source.name,
+  source.database_type,
+  country.country,
+  concept.domain_id,
+  concept.concept_id,
+  concept.concept_name;
 ```
 
 ### data_density {-}
@@ -659,7 +1064,8 @@ SELECT source.acronym,
     JOIN data_source source ON ((source.id = t1.id)))
  ORDER BY t1.table_name, (
        CASE
-           WHEN (t1.stratum_1 ~ '^\d+\.?\d+$'::text) THEN t1.stratum_1
+           WHEN (t1.stratum_1 ~ '^\d+\.?\d+$'::text)
+             THEN t1.stratum_1
            ELSE NULL::text
        END)::integer;
 ```
@@ -670,7 +1076,14 @@ SELECT source.acronym,
 SELECT source.acronym,
    t1.table_name AS series_name,
    to_date(t1.stratum_1, 'YYYYMM'::text) AS x_calendar_month,
-   round(((1.0 * (t1.count_value)::numeric) / (denom.count_value)::numeric), 5) AS y_record_count
+   round(
+     (
+       (1.0 * (t1.count_value)::numeric)
+       /
+       (denom.count_value)::numeric
+     ),
+     5
+   ) AS y_record_count
   FROM ((( SELECT achilles_results.data_source_id AS id,
            'Visit occurrence'::text AS table_name,
            achilles_results.stratum_1,
@@ -766,11 +1179,14 @@ SELECT source.acronym,
            achilles_results.p90_value,
            achilles_results.stdev_value
           FROM achilles_results
-         WHERE (achilles_results.analysis_id = 117)) denom ON (((t1.stratum_1 = denom.stratum_1) AND (t1.id = denom.data_source_id))))
+         WHERE (achilles_results.analysis_id = 117)) denom
+           ON (((t1.stratum_1 = denom.stratum_1)
+             AND (t1.id = denom.data_source_id))))
     JOIN data_source source ON ((source.id = t1.id)))
  ORDER BY t1.table_name, (
        CASE
-           WHEN (t1.stratum_1 ~ '^\d+\.?\d+$'::text) THEN t1.stratum_1
+           WHEN (t1.stratum_1 ~ '^\d+\.?\d+$'::text)
+             THEN t1.stratum_1
            ELSE NULL::text
        END)::integer;
 ```
@@ -789,9 +1205,12 @@ SELECT source.name,
    achilles.p75_value AS p75,
    achilles.p90_value AS p90
   FROM (((achilles_results achilles
-    JOIN data_source source ON ((achilles.data_source_id = source.id)))
-    JOIN concept c1 ON ((achilles.stratum_1 = (c1.concept_id)::text)))
-    JOIN concept c2 ON ((achilles.stratum_2 = (c2.concept_id)::text)))
+    JOIN data_source source
+      ON ((achilles.data_source_id = source.id)))
+    JOIN concept c1
+      ON ((achilles.stratum_1 = (c1.concept_id)::text)))
+    JOIN concept c2
+      ON ((achilles.stratum_2 = (c2.concept_id)::text)))
  WHERE (achilles.analysis_id = 206)
  ORDER BY source.name, c1.concept_name, c2.concept_name;
 ```
@@ -800,25 +1219,82 @@ SELECT source.name,
 
 ```sql
 SELECT
-   source.acronym,
-   (((('<a href="https://athena.ohdsi.org/search-terms/terms/'::text || ar1.concept_id) || '"target="_blank">'::text) || ar1.concept_id) || '</a>'::text) AS concept_id,
-   concept.concept_name,
-   concept.domain_id,
-   (ar1.rc)::integer AS rc,
-   (ar2.drc)::integer AS drc
-  FROM (((( SELECT achilles_results.data_source_id,
-           achilles_results.analysis_id,
-           achilles_results.stratum_1 AS concept_id,
-           achilles_results.count_value AS rc
-          FROM achilles_results
-         WHERE (achilles_results.analysis_id = ANY (ARRAY[(401)::bigint, (601)::bigint, (701)::bigint, (801)::bigint, (1801)::bigint, (2101)::bigint]))) ar1
-    JOIN ( SELECT ar.data_source_id,
-           ar.analysis_id,
-           ar.stratum_1 AS concept_id,
-           ar.count_value AS drc
-          FROM achilles_results ar
-         WHERE (ar.analysis_id = ANY (ARRAY[(430)::bigint, (630)::bigint, (730)::bigint, (830)::bigint, (1830)::bigint, (2130)::bigint]))) ar2 ON (((ar1.concept_id = ar2.concept_id) AND (ar1.data_source_id = ar2.data_source_id))))
-    JOIN data_source source ON ((ar1.data_source_id = source.id)))
-    JOIN concept concept ON ((ar1.concept_id = (concept.concept_id)::text)))
- ORDER BY ((ar2.drc)::integer) DESC;
+  source.acronym,
+  (
+    (
+      (
+        (
+'<a href="https://athena.ohdsi.org/search-terms/terms/' :: text
+          || ar1.concept_id
+        ) || '"target="_blank">' :: text
+      ) || ar1.concept_id
+    ) || '</a>' :: text
+  ) AS concept_id,
+  concept.concept_name,
+  concept.domain_id,
+  (ar1.rc):: integer AS rc,
+  (ar2.drc):: integer AS drc
+FROM
+  (
+    (
+      (
+        (
+          SELECT
+            achilles_results.data_source_id,
+            achilles_results.analysis_id,
+            achilles_results.stratum_1 AS concept_id,
+            achilles_results.count_value AS rc
+          FROM
+            achilles_results
+          WHERE
+            (
+              achilles_results.analysis_id = ANY (
+                ARRAY[(401):: bigint,
+                (601):: bigint,
+                (701):: bigint,
+                (801):: bigint,
+                (1801):: bigint,
+                (2101):: bigint]
+              )
+            )
+        ) ar1
+        JOIN (
+          SELECT
+            ar.data_source_id,
+            ar.analysis_id,
+            ar.stratum_1 AS concept_id,
+            ar.count_value AS drc
+          FROM
+            achilles_results ar
+          WHERE
+            (
+              ar.analysis_id = ANY (
+                ARRAY[(430):: bigint,
+                (630):: bigint,
+                (730):: bigint,
+                (830):: bigint,
+                (1830):: bigint,
+                (2130):: bigint]
+              )
+            )
+        ) ar2 ON (
+          (
+            (ar1.concept_id = ar2.concept_id)
+            AND (
+              ar1.data_source_id = ar2.data_source_id
+            )
+          )
+        )
+      )
+      JOIN data_source source ON (
+        (ar1.data_source_id = source.id)
+      )
+    )
+    JOIN concept concept ON (
+      (
+        ar1.concept_id = (concept.concept_id):: text
+      )
+    )
+  )
+ORDER BY ((ar2.drc):: integer) DESC;
 ```
diff --git a/docs/src/processes.Rmd b/docs/src/processes.Rmd
index b2667c20..adff7ae3 100644
--- a/docs/src/processes.Rmd
+++ b/docs/src/processes.Rmd
@@ -113,10 +113,15 @@ While parsing the uploaded file, some data is extracted to then present on the U
 
 The next table is presented where the previous data is stored on the rows with analysis id 0 and 5000:
 
+```{r table2, echo=FALSE, message=FALSE, warnings=FALSE, results='asis'}
+tabl <- "
 | Analysis Id | Stratum 1 | Stratum 2           | Stratum 3        | Stratum 4   | Stratum 5          |
-| ----------- | --------- | ------------------- | ---------------- | ----------- | ------------------ |
+| -----------:|:--------- | ------------------- | ---------------- | ----------- | ------------------ |
 | 0           |           | R Package Version   | Generation Date  |             |                    |
 | 5000        |           | Source Release Date | CDM Release Date | CDM Version | Vocabulary Version |
+"
+cat(tabl)
+```
 
 ### Materialized Views {-}
 **Target: admin user**
diff --git a/docs/useful-stuff.html b/docs/useful-stuff.html
index 2d4de6b7..7007ac41 100644
--- a/docs/useful-stuff.html
+++ b/docs/useful-stuff.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-04-29" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -327,18 +327,18 @@ <h1>
 <h2><span class="header-section-number">5.2</span> Useful stuff</h2>
 <ul>
 <li><p>How to create a shared link to a dropbox directory using its python’s API:</p>
-<div class="sourceCode" id="cb10"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb10-1"><a href="useful-stuff.html#cb10-1" aria-hidden="true"></a><span class="ex">pip</span> install dropbox</span></code></pre></div>
-<div class="sourceCode" id="cb11"><pre class="sourceCode python"><code class="sourceCode python"><span id="cb11-1"><a href="useful-stuff.html#cb11-1" aria-hidden="true"></a><span class="im">import</span> dropbox</span>
-<span id="cb11-2"><a href="useful-stuff.html#cb11-2" aria-hidden="true"></a>d <span class="op">=</span> dropbox.Dropbox(API_TOKEN)</span>
-<span id="cb11-3"><a href="useful-stuff.html#cb11-3" aria-hidden="true"></a></span>
-<span id="cb11-4"><a href="useful-stuff.html#cb11-4" aria-hidden="true"></a><span class="co"># create a shared link for a directory</span></span>
-<span id="cb11-5"><a href="useful-stuff.html#cb11-5" aria-hidden="true"></a><span class="im">from</span> dropbox.sharing <span class="im">import</span> SharedLinkSettings</span>
-<span id="cb11-6"><a href="useful-stuff.html#cb11-6" aria-hidden="true"></a>sharing_settings <span class="op">=</span> SharedLinkSettings(require_password<span class="op">=</span><span class="va">True</span>, link_password<span class="op">=</span>DIRECTORY_PASSWORD)</span>
-<span id="cb11-7"><a href="useful-stuff.html#cb11-7" aria-hidden="true"></a>d.sharing_create_shared_link_with_settings(DIRECTORY_PATH, sharing_settings)</span>
-<span id="cb11-8"><a href="useful-stuff.html#cb11-8" aria-hidden="true"></a></span>
-<span id="cb11-9"><a href="useful-stuff.html#cb11-9" aria-hidden="true"></a><span class="co"># get all links</span></span>
-<span id="cb11-10"><a href="useful-stuff.html#cb11-10" aria-hidden="true"></a><span class="cf">for</span> link <span class="kw">in</span> d.sharing_get_shared_links().links:</span>
-<span id="cb11-11"><a href="useful-stuff.html#cb11-11" aria-hidden="true"></a>    <span class="bu">print</span>(<span class="ss">f&quot;</span><span class="sc">{</span>link<span class="sc">.</span>path<span class="sc">}</span><span class="ss"> -&gt; </span><span class="sc">{</span>link<span class="sc">.</span>url<span class="sc">}</span><span class="ss">&quot;</span>)</span></code></pre></div></li>
+<div class="sourceCode" id="cb9"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb9-1"><a href="useful-stuff.html#cb9-1" aria-hidden="true"></a><span class="ex">pip</span> install dropbox</span></code></pre></div>
+<div class="sourceCode" id="cb10"><pre class="sourceCode python"><code class="sourceCode python"><span id="cb10-1"><a href="useful-stuff.html#cb10-1" aria-hidden="true"></a><span class="im">import</span> dropbox</span>
+<span id="cb10-2"><a href="useful-stuff.html#cb10-2" aria-hidden="true"></a>d <span class="op">=</span> dropbox.Dropbox(API_TOKEN)</span>
+<span id="cb10-3"><a href="useful-stuff.html#cb10-3" aria-hidden="true"></a></span>
+<span id="cb10-4"><a href="useful-stuff.html#cb10-4" aria-hidden="true"></a><span class="co"># create a shared link for a directory</span></span>
+<span id="cb10-5"><a href="useful-stuff.html#cb10-5" aria-hidden="true"></a><span class="im">from</span> dropbox.sharing <span class="im">import</span> SharedLinkSettings</span>
+<span id="cb10-6"><a href="useful-stuff.html#cb10-6" aria-hidden="true"></a>sharing_settings <span class="op">=</span> SharedLinkSettings(require_password<span class="op">=</span><span class="va">True</span>, link_password<span class="op">=</span>DIRECTORY_PASSWORD)</span>
+<span id="cb10-7"><a href="useful-stuff.html#cb10-7" aria-hidden="true"></a>d.sharing_create_shared_link_with_settings(DIRECTORY_PATH, sharing_settings)</span>
+<span id="cb10-8"><a href="useful-stuff.html#cb10-8" aria-hidden="true"></a></span>
+<span id="cb10-9"><a href="useful-stuff.html#cb10-9" aria-hidden="true"></a><span class="co"># get all links</span></span>
+<span id="cb10-10"><a href="useful-stuff.html#cb10-10" aria-hidden="true"></a><span class="cf">for</span> link <span class="kw">in</span> d.sharing_get_shared_links().links:</span>
+<span id="cb10-11"><a href="useful-stuff.html#cb10-11" aria-hidden="true"></a>    <span class="bu">print</span>(<span class="ss">f&quot;</span><span class="sc">{</span>link<span class="sc">.</span>path<span class="sc">}</span><span class="ss"> -&gt; </span><span class="sc">{</span>link<span class="sc">.</span>url<span class="sc">}</span><span class="ss">&quot;</span>)</span></code></pre></div></li>
 </ul>
 
 </div>
diff --git a/docs/visit-deprecated.html b/docs/visit-deprecated.html
index 5989738a..2b8df8ad 100644
--- a/docs/visit-deprecated.html
+++ b/docs/visit-deprecated.html
@@ -24,7 +24,7 @@
 <meta name="author" content="This document is currently under construction" />
 
 
-<meta name="date" content="2022-01-04" />
+<meta name="date" content="2022-06-18" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -162,8 +162,8 @@
 </ul></li>
 <li class="chapter" data-level="5" data-path="backups.html"><a href="backups.html"><i class="fa fa-check"></i><b>5</b> Backups</a>
 <ul>
-<li class="chapter" data-level="5.1" data-path="restore.html"><a href="restore.html"><i class="fa fa-check"></i><b>5.1</b> Restore</a></li>
-<li class="chapter" data-level="5.2" data-path="useful-stuff.html"><a href="useful-stuff.html"><i class="fa fa-check"></i><b>5.2</b> Useful stuff</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#restore"><i class="fa fa-check"></i>Restore</a></li>
+<li class="chapter" data-level="" data-path="backups.html"><a href="backups.html#useful-stuff"><i class="fa fa-check"></i>Useful stuff</a></li>
 </ul></li>
 <li class="chapter" data-level="6" data-path="customizations.html"><a href="customizations.html"><i class="fa fa-check"></i><b>6</b> Customizations</a>
 <ul>
@@ -268,7 +268,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#css-4"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#data-source-filter-2"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#number-of-patients-in-observation-period-numinobservationperiod"><i class="fa fa-check"></i>Number of Patients in Observation Period {#numInObservationPeriod}</a></li>
+<li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#numInObservationPeriod"><i class="fa fa-check"></i>Number of Patients in Observation Period</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-start-dates"><i class="fa fa-check"></i>Observation Period Start Dates</a></li>
 <li class="chapter" data-level="" data-path="observation-period-deprecated.html"><a href="observation-period-deprecated.html#observation-period-end-dates"><i class="fa fa-check"></i>Observation Period End Dates</a></li>
 </ul></li>
@@ -276,7 +276,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#css-5"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#data-source-filter-3"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-type-table-visittypetable"><i class="fa fa-check"></i>Visit Type Table {#visitTypeTable}</a></li>
+<li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visitTypeTable"><i class="fa fa-check"></i>Visit Type Table</a></li>
 <li class="chapter" data-level="" data-path="visit-deprecated.html"><a href="visit-deprecated.html#visit-types-bars"><i class="fa fa-check"></i>Visit Types Bars</a></li>
 </ul></li>
 <li class="chapter" data-level="9.8" data-path="death-deprecated.html"><a href="death-deprecated.html"><i class="fa fa-check"></i><b>9.8</b> Death [Deprecated]</a>
@@ -303,7 +303,7 @@
 <ul>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#css-9"><i class="fa fa-check"></i>CSS</a></li>
 <li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#data-source-filter-6"><i class="fa fa-check"></i>Data Source Filter</a></li>
-<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#average-number-of-records-per-person-avgrecordsperperson"><i class="fa fa-check"></i>Average Number of Records per Person {#avgRecordsPerPerson}</a></li>
+<li class="chapter" data-level="" data-path="data-domains-deprecated.html"><a href="data-domains-deprecated.html#avgRecordsPerPerson"><i class="fa fa-check"></i>Average Number of Records per Person</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -330,9 +330,9 @@ <h2><span class="header-section-number">9.7</span> Visit [Deprecated]</h2>
 <div id="css-5" class="section level3 unnumbered" number="">
 <h3>CSS</h3>
 <p>To hide the dashboard header insert the following css code to the <code>CSS</code> field on the edit page:</p>
-<div class="sourceCode" id="cb59"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb59-1"><a href="visit-deprecated.html#cb59-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
-<span id="cb59-2"><a href="visit-deprecated.html#cb59-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
-<span id="cb59-3"><a href="visit-deprecated.html#cb59-3" aria-hidden="true"></a>}</span></code></pre></div>
+<div class="sourceCode" id="cb58"><pre class="sourceCode css"><code class="sourceCode css"><span id="cb58-1"><a href="visit-deprecated.html#cb58-1" aria-hidden="true"></a><span class="fu">.dashboard</span> <span class="op">&gt;</span> div<span class="in">:not(</span><span class="fu">.dashboard-content</span><span class="in">)</span> {  <span class="co">/* dashboard header */</span></span>
+<span id="cb58-2"><a href="visit-deprecated.html#cb58-2" aria-hidden="true"></a>  <span class="kw">display</span>: <span class="dv">none</span><span class="op">;</span></span>
+<span id="cb58-3"><a href="visit-deprecated.html#cb58-3" aria-hidden="true"></a>}</span></code></pre></div>
 <p>With this every time you want to edit the dashboard layout you have to either comment the CSS inserted
 or remove it so the “Edit Dashboard” button can show again.</p>
 </div>
@@ -375,8 +375,8 @@ <h4>Chart settings</h4>
 </ul>
 </div>
 </div>
-<div id="visit-type-table-visittypetable" class="section level3 unnumbered" number="">
-<h3>Visit Type Table {#visitTypeTable}</h3>
+<div id="visitTypeTable" class="section level3 unnumbered" number="">
+<h3>Visit Type Table</h3>
 <div class="figure"><span style="display:block;" id="fig:visitTypeTable"></span>
 <img src="images/06-visit/02-visit_types_table.png" alt="Settings for creating the Visit Type Table chart" width="100%" />
 <p class="caption">
@@ -385,16 +385,18 @@ <h3>Visit Type Table {#visitTypeTable}</h3>
 </div>
 <div id="sql-query-16" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb60"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb60-1"><a href="visit-deprecated.html#cb60-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
-<span id="cb60-2"><a href="visit-deprecated.html#cb60-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
-<span id="cb60-3"><a href="visit-deprecated.html#cb60-3" aria-hidden="true"></a>       concept_name <span class="kw">AS</span> <span class="ot">&quot;Type&quot;</span>,</span>
-<span id="cb60-4"><a href="visit-deprecated.html#cb60-4" aria-hidden="true"></a>       <span class="fu">MAX</span>(count_value) <span class="kw">AS</span> <span class="ot">&quot;Count&quot;</span></span>
-<span id="cb60-5"><a href="visit-deprecated.html#cb60-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
-<span id="cb60-6"><a href="visit-deprecated.html#cb60-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb60-7"><a href="visit-deprecated.html#cb60-7" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.concept <span class="kw">ON</span> <span class="fu">CAST</span>(stratum_1 <span class="kw">AS</span> BIGINT) <span class="op">=</span> concept_id</span>
-<span id="cb60-8"><a href="visit-deprecated.html#cb60-8" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">201</span></span>
-<span id="cb60-9"><a href="visit-deprecated.html#cb60-9" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span> name, acronym, <span class="ot">&quot;Type&quot;</span></span>
-<span id="cb60-10"><a href="visit-deprecated.html#cb60-10" aria-hidden="true"></a><span class="kw">ORDER</span> <span class="kw">BY</span> <span class="ot">&quot;Count&quot;</span> <span class="kw">DESC</span></span></code></pre></div>
+<div class="sourceCode" id="cb59"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb59-1"><a href="visit-deprecated.html#cb59-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name,</span>
+<span id="cb59-2"><a href="visit-deprecated.html#cb59-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
+<span id="cb59-3"><a href="visit-deprecated.html#cb59-3" aria-hidden="true"></a>       concept_name <span class="kw">AS</span> <span class="ot">&quot;Type&quot;</span>,</span>
+<span id="cb59-4"><a href="visit-deprecated.html#cb59-4" aria-hidden="true"></a>       <span class="fu">MAX</span>(count_value) <span class="kw">AS</span> <span class="ot">&quot;Count&quot;</span></span>
+<span id="cb59-5"><a href="visit-deprecated.html#cb59-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles</span>
+<span id="cb59-6"><a href="visit-deprecated.html#cb59-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb59-7"><a href="visit-deprecated.html#cb59-7" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb59-8"><a href="visit-deprecated.html#cb59-8" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.concept</span>
+<span id="cb59-9"><a href="visit-deprecated.html#cb59-9" aria-hidden="true"></a>  <span class="kw">ON</span> <span class="fu">CAST</span>(stratum_1 <span class="kw">AS</span> BIGINT) <span class="op">=</span> concept_id</span>
+<span id="cb59-10"><a href="visit-deprecated.html#cb59-10" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">201</span></span>
+<span id="cb59-11"><a href="visit-deprecated.html#cb59-11" aria-hidden="true"></a><span class="kw">GROUP</span> <span class="kw">BY</span> name, acronym, <span class="ot">&quot;Type&quot;</span></span>
+<span id="cb59-12"><a href="visit-deprecated.html#cb59-12" aria-hidden="true"></a><span class="kw">ORDER</span> <span class="kw">BY</span> <span class="ot">&quot;Count&quot;</span> <span class="kw">DESC</span></span></code></pre></div>
 </div>
 <div id="chart-settings-17" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
@@ -428,14 +430,16 @@ <h3>Visit Types Bars</h3>
 </div>
 <div id="sql-query-17" class="section level4 unnumbered" number="">
 <h4>SQL query</h4>
-<div class="sourceCode" id="cb61"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb61-1"><a href="visit-deprecated.html#cb61-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name, </span>
-<span id="cb61-2"><a href="visit-deprecated.html#cb61-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
-<span id="cb61-3"><a href="visit-deprecated.html#cb61-3" aria-hidden="true"></a>       concept_name <span class="kw">AS</span> <span class="ot">&quot;Observation&quot;</span>, </span>
-<span id="cb61-4"><a href="visit-deprecated.html#cb61-4" aria-hidden="true"></a>       count_value</span>
-<span id="cb61-5"><a href="visit-deprecated.html#cb61-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles </span>
-<span id="cb61-6"><a href="visit-deprecated.html#cb61-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span> <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
-<span id="cb61-7"><a href="visit-deprecated.html#cb61-7" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.concept <span class="kw">ON</span> <span class="fu">CAST</span>(stratum_1 <span class="kw">AS</span> BIGINT) <span class="op">=</span> concept_id</span>
-<span id="cb61-8"><a href="visit-deprecated.html#cb61-8" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">201</span></span></code></pre></div>
+<div class="sourceCode" id="cb60"><pre class="sourceCode sql"><code class="sourceCode sql"><span id="cb60-1"><a href="visit-deprecated.html#cb60-1" aria-hidden="true"></a><span class="kw">SELECT</span> <span class="kw">source</span>.name, </span>
+<span id="cb60-2"><a href="visit-deprecated.html#cb60-2" aria-hidden="true"></a>       <span class="kw">source</span>.acronym,</span>
+<span id="cb60-3"><a href="visit-deprecated.html#cb60-3" aria-hidden="true"></a>       concept_name <span class="kw">AS</span> <span class="ot">&quot;Observation&quot;</span>, </span>
+<span id="cb60-4"><a href="visit-deprecated.html#cb60-4" aria-hidden="true"></a>       count_value</span>
+<span id="cb60-5"><a href="visit-deprecated.html#cb60-5" aria-hidden="true"></a><span class="kw">FROM</span> <span class="kw">public</span>.achilles_results <span class="kw">AS</span> achilles </span>
+<span id="cb60-6"><a href="visit-deprecated.html#cb60-6" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.data_source <span class="kw">AS</span> <span class="kw">source</span></span>
+<span id="cb60-7"><a href="visit-deprecated.html#cb60-7" aria-hidden="true"></a>  <span class="kw">ON</span> achilles.data_source_id<span class="op">=</span><span class="kw">source</span>.<span class="kw">id</span></span>
+<span id="cb60-8"><a href="visit-deprecated.html#cb60-8" aria-hidden="true"></a><span class="kw">INNER</span> <span class="kw">JOIN</span> <span class="kw">public</span>.concept</span>
+<span id="cb60-9"><a href="visit-deprecated.html#cb60-9" aria-hidden="true"></a>  <span class="kw">ON</span> <span class="fu">CAST</span>(stratum_1 <span class="kw">AS</span> BIGINT) <span class="op">=</span> concept_id</span>
+<span id="cb60-10"><a href="visit-deprecated.html#cb60-10" aria-hidden="true"></a><span class="kw">WHERE</span> analysis_id <span class="op">=</span> <span class="dv">201</span></span></code></pre></div>
 </div>
 <div id="chart-settings-18" class="section level4 unnumbered" number="">
 <h4>Chart settings</h4>
diff --git a/setup.cfg b/setup.cfg
index 76553c53..968a67c6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,5 +2,8 @@
 combine_as_imports = true
 include_trailing_comma = true
 known_third_party = bootstrap_datepicker_plus,celery,django,model_utils,rest_framework,uploader
+known_first_party = dashboard_viewer,materialized_queries_manager,tabsManager,uploader
+no_lines_before = LOCALFOLDER
 multi_line_output = 3
 order_by_type = false
+extend_skip = migrations
diff --git a/superset/.dockerignore b/superset/.dockerignore
new file mode 100644
index 00000000..e79b8f6e
--- /dev/null
+++ b/superset/.dockerignore
@@ -0,0 +1,47 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+**/__pycache__/
+**/.git
+**/.apache_superset.egg-info
+**/.github
+**/.mypy_cache
+**/.pytest_cache
+**/.tox
+**/.vscode
+**/.idea
+**/.coverage
+**/.DS_Store
+**/.eggs
+**/.python-version
+**/*.egg-info
+**/*.bak
+**/*.db
+**/*.pyc
+**/*.sqllite
+**/*.swp
+**/.terser-plugin-cache/
+**/.storybook/
+**/node_modules/
+
+tests/
+docs/
+install/
+superset-frontend/cypress-base/
+superset-frontend/coverage/
+superset/static/assets/
+superset-websocket/dist/
+venv
diff --git a/superset/Dockerfile b/superset/Dockerfile
index 9865957b..a53b716c 100644
--- a/superset/Dockerfile
+++ b/superset/Dockerfile
@@ -1,9 +1,9 @@
-# Based on https://github.com/apache/superset/blob/1.3.1/Dockerfile
+# Based on https://github.com/apache/superset/blob/1.5.0/Dockerfile
 
 ######################################################################
 # PY stage that simply does a pip install on our requirements
 ######################################################################
-ARG PY_VER=3.7.9
+ARG PY_VER=3.8.12
 FROM python:${PY_VER} AS superset-py
 
 RUN mkdir /app \
@@ -30,7 +30,7 @@ RUN cd /app \
 ######################################################################
 # Node stage to deal with static asset construction
 ######################################################################
-FROM node:14 AS superset-node
+FROM node:16 AS superset-node
 
 ARG NPM_VER=7
 RUN npm install -g npm@${NPM_VER}
@@ -42,35 +42,26 @@ ENV BUILD_CMD=${NPM_BUILD_CMD}
 RUN mkdir -p /app/superset-frontend
 RUN mkdir -p /app/superset/assets
 COPY ./repo/docker/frontend-mem-nag.sh /
-COPY ./repo/superset-frontend/package* /app/superset-frontend/
+COPY ./repo/superset-frontend/ /app/superset-frontend/
 
-COPY ./plugins/plugins /app/superset-frontend/plugins
+# Add our boxplot
+COPY ./box-plot-overrides /app/superset-frontend/plugins/plugin-chart-echarts/
+RUN rm -f /app/superset-frontend/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts
 
 RUN /frontend-mem-nag.sh \
         && cd /app/superset-frontend \
-        && for f in $(ls /app/superset-frontend/plugins) ; do npm install --save ./plugins/$f ; done \
-        && npm ci \
-        && mkdir -p package_json_files \
-        && cp package*.json package_json_files
+        && npm ci
 
-# Next, copy in the rest and let webpack do its thing
-COPY ./repo/superset-frontend /app/superset-frontend
-
-#COPY ./plugins/setupPluginsExtra.ts /app/superset-frontend/src/setup/setupPluginsExtra.ts
-COPY ./plugins/MainPreset.js /app/superset-frontend/src/visualizations/presets/MainPreset.js
-
-# This is BY FAR the most expensive step (thanks Terser!)
+# This seems to be the most expensive step
 RUN cd /app/superset-frontend \
-        && mv package_json_files/* . \
         && npm run ${BUILD_CMD} \
-        && rm -rf node_modules \
-        && rmdir package_json_files
+        && rm -rf node_modules
 
 
 ######################################################################
 # Final lean image...
 ######################################################################
-ARG PY_VER=3.7.9
+ARG PY_VER=3.8.12
 FROM python:${PY_VER} AS lean
 
 ENV LANG=C.UTF-8 \
@@ -89,12 +80,13 @@ RUN mkdir -p ${PYTHONPATH} \
             default-libmysqlclient-dev \
             libsasl2-modules-gssapi-mit \
             libpq-dev \
+            libecpg-dev \
         && rm -rf /var/lib/apt/lists/*
 
 # Copying configs. No need for a volume
 COPY ./repo/docker/pythonpath_dev/superset_config.py ./superset_config_docker.py /app/pythonpath_docker/
 
-COPY --from=superset-py /usr/local/lib/python3.7/site-packages/ /usr/local/lib/python3.7/site-packages/
+COPY --from=superset-py /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
 # Copying site-packages doesn't move the CLIs, so let's copy them one by one
 COPY --from=superset-py /usr/local/bin/gunicorn /usr/local/bin/celery /usr/local/bin/flask /usr/bin/
 COPY --from=superset-node /app/superset/static/assets /app/superset/static/assets
@@ -105,11 +97,14 @@ COPY repo/superset /app/superset
 COPY repo/setup.py repo/MANIFEST.in repo/README.md /app/
 RUN cd /app \
         && chown -R superset:superset * \
-        && pip install -e .
+        && pip install -e . \
+        && flask fab babel-compile --target superset/translations
 
-COPY ./repo/docker/docker-entrypoint.sh /usr/bin/
+COPY ./repo/docker/run-server.sh /usr/bin/
 # copy scripts to start containers to avoid volumes
-COPY ./repo/docker/docker-bootstrap.sh ./repo/docker/docker-init.sh ./repo/docker/docker-entrypoint.sh /app/docker/
+COPY ./repo/docker/docker-bootstrap.sh ./repo/docker/docker-init.sh /app/docker/
+
+RUN chmod a+x /usr/bin/run-server.sh
 
 WORKDIR /app
 
@@ -119,4 +114,4 @@ HEALTHCHECK CMD curl -f "http://localhost:$SUPERSET_PORT/health"
 
 EXPOSE ${SUPERSET_PORT}
 
-ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
+CMD /usr/bin/run-server.sh
diff --git a/superset/box-plot-overrides/src/BoxPlot/buildQuery.ts b/superset/box-plot-overrides/src/BoxPlot/buildQuery.ts
new file mode 100644
index 00000000..f1b95c90
--- /dev/null
+++ b/superset/box-plot-overrides/src/BoxPlot/buildQuery.ts
@@ -0,0 +1,108 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { buildQueryContext } from '@superset-ui/core';
+import { boxplotOperator } from '@superset-ui/chart-controls';
+import { BoxPlotQueryFormData } from './types';
+
+export default function buildQuery(formData: BoxPlotQueryFormData) {
+  const {
+    query_mode,
+    minimum,
+    p10,
+    p25,
+    median,
+    p75,
+    p90,
+    maximum,
+    columns = [],
+    granularity_sqla,
+    groupby = [],
+  } = formData;
+  return buildQueryContext(formData, baseQueryObject => {
+    if (query_mode === 'raw') {
+      if (groupby.length === 0) {
+        throw new Error(`Error: No series column defined.`);
+      }
+
+      const missing_columns = [
+        'minimum',
+        'p10',
+        'p25',
+        'median',
+        'p75',
+        'p90',
+        'maximum',
+      ]
+        .filter(c => !formData[c] || Array.isArray(formData[c]))
+        .map(c => c.toUpperCase());
+      if (missing_columns.length > 0) {
+        if (missing_columns.length > 1) {
+          throw new Error(
+            `Error: Columns ${missing_columns
+              .slice(0, missing_columns.length - 1)
+              .join(', ')} and ${
+              missing_columns[missing_columns.length - 1]
+            } are not defined.`,
+          );
+        } else {
+          throw new Error(
+            `Error: Column ${missing_columns[0]} is not defined.`,
+          );
+        }
+      }
+
+      const { outliers } = formData;
+
+      const queries = [
+        {
+          ...baseQueryObject,
+          metrics: [],
+          series_columns: groupby,
+          columns: [...groupby, minimum, p10, p25, median, p75, p90, maximum],
+        },
+      ].concat(
+        outliers && !Array.isArray(outliers)
+          ? {
+              ...baseQueryObject,
+              metrics: [],
+              series_columns: groupby,
+              columns: [...groupby, outliers],
+            }
+          : [],
+      );
+
+      return queries;
+    }
+
+    const distributionColumns: string[] = [];
+    // For now default to using the temporal column as distribution column.
+    // In the future this control should be made mandatory.
+    if (!columns.length && granularity_sqla) {
+      distributionColumns.push(granularity_sqla);
+    }
+    return [
+      {
+        ...baseQueryObject,
+        columns: [...distributionColumns, ...columns, ...groupby],
+        series_columns: groupby,
+        post_processing: [boxplotOperator(formData, baseQueryObject)],
+      },
+    ];
+  });
+}
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/controlPanel.tsx b/superset/box-plot-overrides/src/BoxPlot/controlPanel.tsx
similarity index 60%
rename from superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/controlPanel.tsx
rename to superset/box-plot-overrides/src/BoxPlot/controlPanel.tsx
index aac54caa..c09efec9 100644
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/controlPanel.tsx
+++ b/superset/box-plot-overrides/src/BoxPlot/controlPanel.tsx
@@ -18,11 +18,12 @@
  */
 import React from 'react';
 import {
+  ensureIsArray,
   QueryFormColumn,
   QueryMode,
   t,
 } from '@superset-ui/core';
-  
+
 import {
   ColumnOption,
   ControlConfig,
@@ -36,14 +37,18 @@ import {
   emitFilterControl,
   sharedControls,
   QueryModeLabel,
+  ControlPanelConfig,
 } from '@superset-ui/chart-controls';
 
+// all these functions and variables below were copied/adpated from plugin-chart-table/src/controlPanel.tsx
 function getQueryMode(controls: ControlStateMapping): QueryMode {
   const mode = controls?.query_mode?.value;
   if (mode === QueryMode.aggregate || mode === QueryMode.raw) {
     return mode as QueryMode;
   }
-  const rawColumns = controls?.all_columns?.value as QueryFormColumn[] | undefined;
+  const rawColumns = controls?.all_columns?.value as
+    | QueryFormColumn[]
+    | undefined;
   const hasRawColumns = rawColumns && rawColumns.length > 0;
   return hasRawColumns ? QueryMode.raw : QueryMode.aggregate;
 }
@@ -52,7 +57,8 @@ function getQueryMode(controls: ControlStateMapping): QueryMode {
  * Visibility check
  */
 function isQueryMode(mode: QueryMode) {
-  return ({ controls }: ControlPanelsContainerProps) => getQueryMode(controls) === mode;
+  return ({ controls }: Pick<ControlPanelsContainerProps, 'controls'>) =>
+    getQueryMode(controls) === mode;
 }
 
 const isAggMode = isQueryMode(QueryMode.aggregate);
@@ -64,32 +70,59 @@ const queryMode: ControlConfig<'RadioButtonControl'> = {
   default: null,
   options: [
     [QueryMode.aggregate, QueryModeLabel[QueryMode.aggregate]],
-    [QueryMode.raw, QueryModeLabel[QueryMode.raw]]
+    [QueryMode.raw, QueryModeLabel[QueryMode.raw]],
   ],
   mapStateToProps: ({ controls }) => ({ value: getQueryMode(controls) }),
+  rerender: [
+    'minimum',
+    'p10',
+    'p25',
+    'median',
+    'p75',
+    'p90',
+    'maximum',
+    'outliers',
+    'whiskerOptions',
+    'columns',
+    'groupby',
+    'metrics',
+  ],
 };
 
-const all_columns: typeof sharedControls.groupby = {
-  type: 'SelectControl',
-  label: t('P90'),
-  description: t('Column holding the 90th percentile values'),
-  multi: false,
-  freeForm: false,
-  allowAll: true,
-  commaChoosesOption: false,
-  default: [],
-  optionRenderer: c => <ColumnOption showType column={c} />,
-  valueRenderer: c => <ColumnOption column={c} />,
-  valueKey: 'column_name',
-  mapStateToProps: ({ datasource, controls }) => ({
-    options: datasource?.columns || [],
-    queryMode: getQueryMode(controls),
-  }),
-  visibility: isRawMode,
-};
+function generate_all_columns_config(
+  label: string,
+  description: string,
+  validation = true,
+): typeof sharedControls.groupby {
+  // TODO dnd not implemented
 
+  return {
+    type: 'SelectControl',
+    label: t(label),
+    description: t(description),
+    multi: false,
+    freeForm: false,
+    allowAll: true,
+    commaChoosesOption: false,
+    default: [],
+    optionRenderer: c => <ColumnOption showType column={c} />,
+    valueRenderer: c => <ColumnOption column={c} />,
+    valueKey: 'column_name',
+    mapStateToProps: ({ datasource, controls }, controlState) => ({
+      options: datasource?.columns || [],
+      queryMode: getQueryMode(controls),
+      externalValidationErrors:
+        isRawMode({ controls }) &&
+        validation &&
+        ensureIsArray(controlState.value).length === 0
+          ? [t('must have a value')]
+          : [],
+    }),
+    visibility: isRawMode,
+  };
+}
 
-export default {
+const config: ControlPanelConfig = {
   controlPanelSections: [
     sections.legacyTimeseriesTime,
     {
@@ -105,90 +138,91 @@ export default {
         [
           {
             name: 'minimum',
-            config: {
-              ...all_columns,
-              label: t('Min'),
-              description: t('Column holding the minimum values'),
-            },
+            config: generate_all_columns_config(
+              'Min',
+              'Column holding the minimum values',
+            ),
           },
         ],
         [
           {
             name: 'p10',
-            config: {
-              ...all_columns,
-              label: t('P10'),
-              description: t('Column holding the 10th percentile values'),
-            },
+            config: generate_all_columns_config(
+              'P10',
+              'Column holding the 10th percentile values',
+            ),
           },
           {
             name: 'p25',
-            config: {
-              ...all_columns,
-              label: t('P25'),
-              description: t('Column holding the 25th percentile values'),
-            },
+            config: generate_all_columns_config(
+              'P10',
+              'Column holding the 25th percentile values',
+            ),
           },
         ],
         [
           {
             name: 'median',
-            config: {
-              ...all_columns,
-              label: t('Median/P50'),
-              description: t('Column holding the median values'),
-            },
+            config: generate_all_columns_config(
+              'Median/P50',
+              'Column holding the median values',
+            ),
           },
         ],
         [
           {
             name: 'p75',
-            config: {
-              ...all_columns,
-              label: t('P75'),
-              description: t('Column holding the 75th percentile values'),
-            },
+            config: generate_all_columns_config(
+              'P75',
+              'Column holding the 75th percentile values',
+            ),
           },
           {
             name: 'p90',
-            config: all_columns,
+            config: generate_all_columns_config(
+              'P90',
+              'Column holding the 90th percentile values',
+            ),
           },
         ],
         [
           {
             name: 'maximum',
-            config: {
-              ...all_columns,
-              label: t('Max'),
-              description: t('Column holding the maximum values'),
-            },
+            config: generate_all_columns_config(
+              'Max',
+              'Column holding the maximum values',
+            ),
           },
         ],
         [
           {
             name: 'outliers',
-            config: {
-              ...all_columns,
-              label: t('Outliers'),
-              description: t('Column holding outliers values'),
-            },
+            config: generate_all_columns_config(
+              'Outliers',
+              'Column holding outliers values',
+              false,
+            ),
           },
         ],
         ['metrics'],
         ['adhoc_filters'],
         emitFilterControl,
         ['groupby'],
-        ['columns'],
-        ['limit'],
+        ['columns'], // TODO: this should be migrated to `series_columns`
+        ['series_limit'],
+        ['series_limit_metric'],
         [
           {
             name: 'whiskerOptions',
             config: {
+              clearable: false,
               type: 'SelectControl',
               freeForm: true,
               label: t('Whisker/outlier options'),
               default: 'Tukey',
-              description: t('Determines how whiskers and outliers are calculated.'),
+              description: t(
+                'Determines how whiskers and outliers are calculated.',
+              ),
               choices: formatSelectOptions([
                 'Tukey',
                 'Min/max (no outliers)',
@@ -201,6 +235,7 @@ export default {
         ],
       ],
     },
+    sections.titleControls,
     {
       label: t('Chart Options'),
       expanded: true,
@@ -212,7 +247,13 @@ export default {
             config: {
               type: 'SelectControl',
               label: t('X Tick Layout'),
-              choices: formatSelectOptions(['auto', 'flat', '45°', '90°', 'staggered']),
+              choices: formatSelectOptions([
+                'auto',
+                'flat',
+                '45°',
+                '90°',
+                'staggered',
+              ]),
               default: 'auto',
               clearable: false,
               renderTrigger: true,
@@ -230,9 +271,10 @@ export default {
               renderTrigger: true,
               default: 'SMART_NUMBER',
               choices: D3_FORMAT_OPTIONS,
-              description: `${t('D3 format syntax: https://github.com/d3/d3-format')} ${t(
-                'Only applies when "Label Type" is set to show values.',
-              )}`,
+              description: `${t(
+                'D3 format syntax: https://github.com/d3/d3-format',
+              )}
+                ${t('Only applies when "Label Type" is set to show values.')}`,
             },
           },
         ],
@@ -273,3 +315,4 @@ export default {
     },
   },
 };
+export default config;
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/transformProps.ts b/superset/box-plot-overrides/src/BoxPlot/transformProps.ts
similarity index 60%
rename from superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/transformProps.ts
rename to superset/box-plot-overrides/src/BoxPlot/transformProps.ts
index 21195af6..6165f737 100644
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/transformProps.ts
+++ b/superset/box-plot-overrides/src/BoxPlot/transformProps.ts
@@ -19,28 +19,34 @@
 import {
   CategoricalColorNamespace,
   DataRecordValue,
+  getColumnLabel,
   DataRecord,
   getMetricLabel,
   getNumberFormatter,
   getTimeFormatter,
   QueryMode,
 } from '@superset-ui/core';
-import { EChartsOption, BoxplotSeriesOption } from 'echarts';
-import { CallbackDataParams,  } from 'echarts/types/src/util/types';
+import { EChartsCoreOption, BoxplotSeriesOption } from 'echarts';
+import { CallbackDataParams } from 'echarts/types/src/util/types';
 import {
   BoxPlotChartTransformedProps,
   BoxPlotQueryFormData,
   EchartsBoxPlotChartProps,
 } from './types';
-import { extractGroupbyLabel, getColtypesMapping, sanitizeHtml } from '../utils/series';
+import {
+  extractGroupbyLabel,
+  getColtypesMapping,
+  sanitizeHtml,
+} from '../utils/series';
 import { defaultGrid, defaultTooltip, defaultYAxis } from '../defaults';
+import { getPadding } from '../Timeseries/transformers';
 import { OpacityEnum } from '../constants';
-import d3 from 'd3';
 
 export default function transformProps(
   chartProps: EchartsBoxPlotChartProps,
 ): BoxPlotChartTransformedProps {
-  const { width, height, formData, hooks, filterState, queriesData } = chartProps;
+  const { width, height, formData, hooks, filterState, queriesData } =
+    chartProps;
   const { data: original_data = [] } = queriesData[0];
   const { setDataMask = () => {} } = hooks;
   const coltypeMapping = getColtypesMapping(queriesData[0]);
@@ -48,105 +54,105 @@ export default function transformProps(
     colorScheme,
     queryMode,
     groupby = [],
-    metrics: formdataMetrics = [],
+    metrics = [],
     numberFormat,
     dateFormat,
     xTicksLayout,
     emitFilter,
+    legendOrientation = 'top',
+    xAxisTitle,
+    yAxisTitle,
+    xAxisTitleMargin,
+    yAxisTitleMargin,
+    yAxisTitlePosition,
   } = formData as BoxPlotQueryFormData;
   const colorFn = CategoricalColorNamespace.getScale(colorScheme as string);
   const numberFormatter = getNumberFormatter(numberFormat);
+  const groupbyLabels = groupby.map(getColumnLabel);
 
   let transformedData: {
     name: string;
     value: any[];
     itemStyle: {
-        color: string;
-        opacity: number;
-        borderColor: string;
+      color: string;
+      opacity: number;
+      borderColor: string;
     };
-  }[], outlierData;
+  }[];
+  let outlierData;
 
-  if (queryMode == QueryMode.raw) {
-    const data = d3
-      .nest()
-      .key(row => extractGroupbyLabel(
-        {
+  if (queryMode === QueryMode.raw) {
+    const data = Object.fromEntries(
+      queriesData[0].data.map(row => {
+        const key = extractGroupbyLabel({
           datum: row as DataRecord,
-          groupby,
+          groupby: groupbyLabels,
           coltypeMapping,
           timeFormatter: getTimeFormatter(dateFormat),
-        }
-      ))
-      .entries(queriesData[0].data)
-      .reduce((result: {[key: string]: DataRecord}, item, _) => {
-        result[item.key] = item.values[0];
-        return result;
-      }, {})
+        });
+
+        return [key, row];
+      }),
+    );
 
-    const { outliers }  = formData;
-    let outlierMapping: {[key: string]: DataRecord[]};
+    const { outliers } = formData;
+    let outlierMapping: { [key: string]: DataRecord[] };
     if (outliers && !Array.isArray(outliers)) {
-      outlierMapping = d3
-        .nest()
-        .key(row => extractGroupbyLabel(
-          {
-            datum: row as DataRecord,
-            groupby,
+      outlierMapping = queriesData[1].data.reduce(
+        (current: { [key: string]: DataRecord[] }, item) => {
+          const key = extractGroupbyLabel({
+            datum: item as DataRecord,
+            groupby: groupbyLabels,
             coltypeMapping,
             timeFormatter: getTimeFormatter(dateFormat),
-          }))
-        .entries(queriesData[1].data)
-        .reduce((result: {[key: string]: DataRecord[]}, item, _) => {
-          const values = item.values.filter((v: DataRecord) => v[outliers])
-          if (values.length > 0) {
-            result[item.key] = values;
-          }
-          return result;
-        }, {});
+          });
+
+          const ret_val = { ...current };
+          ret_val[key] = ret_val[key] ? [...ret_val[key], item] : [item];
+          return ret_val;
+        },
+        {},
+      );
 
       outlierData = Object.entries(outlierMapping)
         .map(([groupbyLabel, outlierDatum]) => {
-            const isFiltered = filterState.selectedValues && !filterState.selectedValues.includes(groupbyLabel);
+          const isFiltered =
+            filterState.selectedValues &&
+            !filterState.selectedValues.includes(groupbyLabel);
 
-            return {
-              name: 'outlier',
-              type: 'scatter',
-              data: outlierDatum.map(val => [groupbyLabel, val[outliers]]),
-              tooltip: {
-                formatter: (param: { data: [string, number] }) => {
-                  const [outlierName, stats] = param.data;
-                  const headline = groupby
-                    ? `<p><strong>${sanitizeHtml(outlierName)}</strong></p>`
-                    : '';
-                  return `${headline}${numberFormatter(stats)}`;
-                },
-              },
-              itemStyle: {
-                color: colorFn(groupbyLabel),
-                opacity: isFiltered ? OpacityEnum.SemiTransparent : OpacityEnum.NonTransparent,
+          return {
+            name: 'outlier',
+            type: 'scatter',
+            data: outlierDatum.map(val => [groupbyLabel, val[outliers]]),
+            tooltip: {
+              formatter: (param: { data: [string, number] }) => {
+                const [outlierName, stats] = param.data;
+                const headline = groupbyLabels.length
+                  ? `<p><strong>${sanitizeHtml(outlierName)}</strong></p>`
+                  : '';
+                return `${headline}${numberFormatter(stats)}`;
               },
-            };
-          },
-        )
+            },
+            itemStyle: {
+              color: colorFn(groupbyLabel),
+              opacity: isFiltered
+                ? OpacityEnum.SemiTransparent
+                : OpacityEnum.NonTransparent,
+            },
+          };
+        })
         .flat(2);
     }
 
-    
-    const {
-      minimum,
-      p10,
-      p25,
-      median,
-      p75,
-      p90,
-      maximum,
-    } = formData as BoxPlotQueryFormData;
+    const { minimum, p10, p25, median, p75, p90, maximum } =
+      formData as BoxPlotQueryFormData;
 
     transformedData = Object.entries(data)
       .map(([groupByLabel, datum]) => {
-        const isFiltered = filterState.selectedValues && !filterState.selectedValues.includes(groupByLabel);
-        
+        const isFiltered =
+          filterState.selectedValues &&
+          !filterState.selectedValues.includes(groupByLabel);
+
         return {
           name: groupByLabel,
           value: [
@@ -157,31 +163,39 @@ export default function transformProps(
             datum[p90],
             datum[minimum],
             datum[maximum],
-            outlierMapping ? (groupByLabel in outlierMapping ? outlierMapping[groupByLabel] : []) : []
+            outlierMapping
+              ? groupByLabel in outlierMapping
+                ? outlierMapping[groupByLabel]
+                : []
+              : [],
           ],
           itemStyle: {
             color: colorFn(groupByLabel),
             opacity: isFiltered ? OpacityEnum.SemiTransparent : 0.6,
             borderColor: colorFn(groupByLabel),
           },
-        }
+        };
       })
       .flatMap(row => row);
-  }
-  else {
-    const metricLabels = formdataMetrics.map(getMetricLabel);
+  } else {
+    const metricLabels = metrics.map(getMetricLabel);
 
     transformedData = original_data
       .map((datum: any) => {
         const groupbyLabel = extractGroupbyLabel({
           datum,
-          groupby,
+          groupby: groupbyLabels,
           coltypeMapping,
           timeFormatter: getTimeFormatter(dateFormat),
         });
         return metricLabels.map(metric => {
-          const name = metricLabels.length === 1 ? groupbyLabel : `${groupbyLabel}, ${metric}`;
-          const isFiltered = filterState.selectedValues && !filterState.selectedValues.includes(name);
+          const name =
+            metricLabels.length === 1
+              ? groupbyLabel
+              : `${groupbyLabel}, ${metric}`;
+          const isFiltered =
+            filterState.selectedValues &&
+            !filterState.selectedValues.includes(name);
           return {
             name,
             value: [
@@ -209,14 +223,19 @@ export default function transformProps(
         metricLabels.map(metric => {
           const groupbyLabel = extractGroupbyLabel({
             datum,
-            groupby,
+            groupby: groupbyLabels,
             coltypeMapping,
             timeFormatter: getTimeFormatter(dateFormat),
           });
-          const name = metricLabels.length === 1 ? groupbyLabel : `${groupbyLabel}, ${metric}`;
+          const name =
+            metricLabels.length === 1
+              ? groupbyLabel
+              : `${groupbyLabel}, ${metric}`;
           // Outlier data is a nested array of numbers (uncommon, therefore no need to add to DataRecordValue)
           const outlierDatum = (datum[`${metric}__outliers`] || []) as number[];
-          const isFiltered = filterState.selectedValues && !filterState.selectedValues.includes(name);
+          const isFiltered =
+            filterState.selectedValues &&
+            !filterState.selectedValues.includes(name);
           return {
             name: 'outlier',
             type: 'scatter',
@@ -224,7 +243,7 @@ export default function transformProps(
             tooltip: {
               formatter: (param: { data: [string, number] }) => {
                 const [outlierName, stats] = param.data;
-                const headline = groupby
+                const headline = groupbyLabels.length
                   ? `<p><strong>${sanitizeHtml(outlierName)}</strong></p>`
                   : '';
                 return `${headline}${numberFormatter(stats)}`;
@@ -232,7 +251,9 @@ export default function transformProps(
             },
             itemStyle: {
               color: colorFn(groupbyLabel),
-              opacity: isFiltered ? OpacityEnum.SemiTransparent : OpacityEnum.NonTransparent,
+              opacity: isFiltered
+                ? OpacityEnum.SemiTransparent
+                : OpacityEnum.NonTransparent,
             },
           };
         }),
@@ -240,22 +261,27 @@ export default function transformProps(
       .flat(2);
   }
 
-  const labelMap = original_data.reduce((acc: Record<string, DataRecordValue[]>, datum) => {
-    const label = extractGroupbyLabel({
-      datum,
-      groupby,
-      coltypeMapping,
-      timeFormatter: getTimeFormatter(dateFormat),
-    });
-    return {
-      ...acc,
-      [label]: groupby.map(col => datum[col]),
-    };
-  }, {});
+  const labelMap = original_data.reduce(
+    (acc: Record<string, DataRecordValue[]>, datum) => {
+      const label = extractGroupbyLabel({
+        datum,
+        groupby: groupbyLabels,
+        coltypeMapping,
+        timeFormatter: getTimeFormatter(dateFormat),
+      });
+      return {
+        ...acc,
+        [label]: groupbyLabels.map(col => datum[col]),
+      };
+    },
+    {},
+  );
 
   const selectedValues = (filterState.selectedValues || []).reduce(
     (acc: Record<string, number>, selectedValue: string) => {
-      const index = transformedData.findIndex(({ name }) => name === selectedValue);
+      const index = transformedData.findIndex(
+        ({ name }) => name === selectedValue,
+      );
       return {
         ...acc,
         [index]: selectedValue,
@@ -285,12 +311,24 @@ export default function transformProps(
             value,
             name,
           }: {
-            value: [number, number, number, number, number, number, number, number, number[]];
+            value: [
+              number,
+              number,
+              number,
+              number,
+              number,
+              number,
+              number,
+              number,
+              number[],
+            ];
             name: string;
           } = param;
-          const headline = name ? `<p><strong>${sanitizeHtml(name)}</strong></p>` : '';
+          const headline = name
+            ? `<p><strong>${sanitizeHtml(name)}</strong></p>`
+            : '';
           let stats;
-          if (queryMode == QueryMode.raw) {
+          if (queryMode === QueryMode.raw) {
             stats = [
               `Max: ${numberFormatter(value[7])}`,
               `90th Percentile: ${numberFormatter(value[5])}`,
@@ -300,8 +338,7 @@ export default function transformProps(
               `10th Percentile: ${numberFormatter(value[1])}`,
               `Min: ${numberFormatter(value[6])}`,
             ];
-          }
-          else {
+          } else {
             stats = [
               `Max: ${numberFormatter(value[5])}`,
               `3rd Quartile: ${numberFormatter(value[4])}`,
@@ -322,24 +359,40 @@ export default function transformProps(
     // @ts-ignore
     ...outlierData,
   ];
+  const addYAxisTitleOffset = !!yAxisTitle;
+  const addXAxisTitleOffset = !!xAxisTitle;
+  const chartPadding = getPadding(
+    true,
+    legendOrientation,
+    addYAxisTitleOffset,
+    false,
+    null,
+    addXAxisTitleOffset,
+    yAxisTitlePosition,
+    yAxisTitleMargin,
+    xAxisTitleMargin,
+  );
 
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     grid: {
       ...defaultGrid,
-      top: 30,
-      bottom: 30,
-      left: 20,
-      right: 20,
+      ...chartPadding,
     },
     xAxis: {
       type: 'category',
       data: transformedData.map(row => row.name),
       axisLabel,
+      name: xAxisTitle,
+      nameGap: xAxisTitleMargin,
+      nameLocation: 'middle',
     },
     yAxis: {
       ...defaultYAxis,
       type: 'value',
       axisLabel: { formatter: numberFormatter },
+      name: yAxisTitle,
+      nameGap: yAxisTitleMargin,
+      nameLocation: yAxisTitlePosition === 'Left' ? 'middle' : 'end',
     },
     tooltip: {
       ...defaultTooltip,
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/types.ts b/superset/box-plot-overrides/src/BoxPlot/types.ts
similarity index 78%
rename from superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/types.ts
rename to superset/box-plot-overrides/src/BoxPlot/types.ts
index 3ba756a1..f4161358 100644
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/types.ts
+++ b/superset/box-plot-overrides/src/BoxPlot/types.ts
@@ -20,23 +20,22 @@ import {
   ChartDataResponseResult,
   ChartProps,
   DataRecordValue,
+  QueryFormColumn,
   QueryFormData,
   SetDataMaskHook,
 } from '@superset-ui/core';
-import { PostProcessingBoxplot } from '@superset-ui/core/lib/query/types/PostProcessing';
-import { EChartsOption } from 'echarts';
+import { EChartsCoreOption } from 'echarts';
+import { EchartsTitleFormData, DEFAULT_TITLE_FORM_DATA } from '../types';
 
 export type BoxPlotQueryFormData = QueryFormData & {
   numberFormat?: string;
-  query_mode?: string;
+  query_mode?: BoxPlotFormDataQueryMode;
   whiskerOptions?: BoxPlotFormDataWhiskerOptions;
   xTickLayout?: BoxPlotFormXTickLayout;
   emitFilter: boolean;
-};
+} & EchartsTitleFormData;
 
-export type BoxPlotFormDataQueryMode =
-  | 'aggregate'
-  | 'raw';
+export type BoxPlotFormDataQueryMode = 'aggregate' | 'raw';
 
 export type BoxPlotFormDataWhiskerOptions =
   | 'Tukey'
@@ -44,11 +43,18 @@ export type BoxPlotFormDataWhiskerOptions =
   | '2/98 percentiles'
   | '9/91 percentiles';
 
-export type BoxPlotFormXTickLayout = '45°' | '90°' | 'auto' | 'flat' | 'staggered';
+export type BoxPlotFormXTickLayout =
+  | '45°'
+  | '90°'
+  | 'auto'
+  | 'flat'
+  | 'staggered';
 
 // @ts-ignore
 export const DEFAULT_FORM_DATA: BoxPlotQueryFormData = {
   emitFilter: false,
+  query_mode: 'aggregate',
+  ...DEFAULT_TITLE_FORM_DATA,
 };
 
 export interface EchartsBoxPlotChartProps extends ChartProps {
@@ -56,17 +62,14 @@ export interface EchartsBoxPlotChartProps extends ChartProps {
   queriesData: ChartDataResponseResult[];
 }
 
-export type BoxPlotQueryObjectWhiskerType = PostProcessingBoxplot['options']['whisker_type'];
-
-
 export interface BoxPlotChartTransformedProps {
   formData: BoxPlotQueryFormData;
   height: number;
   width: number;
-  echartOptions: EChartsOption;
+  echartOptions: EChartsCoreOption;
   emitFilter: boolean;
   setDataMask: SetDataMaskHook;
   labelMap: Record<string, DataRecordValue[]>;
-  groupby: string[];
+  groupby: QueryFormColumn[];
   selectedValues: Record<number, string>;
-}
\ No newline at end of file
+}
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/test/BoxPlot/transformProps.test.ts b/superset/box-plot-overrides/test/BoxPlot/transformProps.test.ts
similarity index 78%
rename from superset/plugins/plugins/plugin-chart-box-plot/test/BoxPlot/transformProps.test.ts
rename to superset/box-plot-overrides/test/BoxPlot/transformProps.test.ts
index 6fc4f26a..d5488149 100644
--- a/superset/plugins/plugins/plugin-chart-box-plot/test/BoxPlot/transformProps.test.ts
+++ b/superset/box-plot-overrides/test/BoxPlot/transformProps.test.ts
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ChartProps } from '@superset-ui/core';
+import { ChartProps, SqlaFormData } from '@superset-ui/core';
+import { EchartsBoxPlotChartProps } from '../../src/BoxPlot/types';
 import transformProps from '../../src/BoxPlot/transformProps';
 
 describe('BoxPlot tranformProps', () => {
-  const formData = {
+  const formData: SqlaFormData = {
     datasource: '5__table',
     granularity_sqla: 'ds',
     time_grain_sqla: 'P1Y',
@@ -68,7 +69,9 @@ describe('BoxPlot tranformProps', () => {
   });
 
   it('should tranform chart props for viz', () => {
-    expect(transformProps(chartProps)).toEqual(
+    expect(
+      transformProps(chartProps as unknown as EchartsBoxPlotChartProps),
+    ).toEqual(
       expect.objectContaining({
         width: 800,
         height: 600,
@@ -79,11 +82,29 @@ describe('BoxPlot tranformProps', () => {
               data: expect.arrayContaining([
                 expect.objectContaining({
                   name: 'organic, Charlotte',
-                  value: [1.4775, 1.73875, 1.9025, 2.105, 2.505, 1.9405512820512825, 39, [2.735]],
+                  value: [
+                    1.4775,
+                    1.73875,
+                    1.9025,
+                    2.105,
+                    2.505,
+                    1.9405512820512825,
+                    39,
+                    [2.735],
+                  ],
                 }),
                 expect.objectContaining({
                   name: 'organic, Hartford Springfield',
-                  value: [1.862, 2.1285, 2.265, 2.32625, 2.595, 2.231141025641026, 39, []],
+                  value: [
+                    1.862,
+                    2.1285,
+                    2.265,
+                    2.32625,
+                    2.595,
+                    2.231141025641026,
+                    39,
+                    [],
+                  ],
                 }),
               ]),
             }),
diff --git a/superset/plugins/MainPreset.js b/superset/plugins/MainPreset.js
deleted file mode 100644
index de903a5c..00000000
--- a/superset/plugins/MainPreset.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { isFeatureEnabled, Preset, FeatureFlag } from '@superset-ui/core';
-import {
-  BigNumberChartPlugin,
-  BigNumberTotalChartPlugin,
-} from '@superset-ui/legacy-preset-chart-big-number';
-import CalendarChartPlugin from '@superset-ui/legacy-plugin-chart-calendar';
-import ChordChartPlugin from '@superset-ui/legacy-plugin-chart-chord';
-import CountryMapChartPlugin from '@superset-ui/legacy-plugin-chart-country-map';
-import EventFlowChartPlugin from '@superset-ui/legacy-plugin-chart-event-flow';
-import HeatmapChartPlugin from '@superset-ui/legacy-plugin-chart-heatmap';
-import HistogramChartPlugin from '@superset-ui/legacy-plugin-chart-histogram';
-import HorizonChartPlugin from '@superset-ui/legacy-plugin-chart-horizon';
-import MapBoxChartPlugin from '@superset-ui/legacy-plugin-chart-map-box';
-import PairedTTestChartPlugin from '@superset-ui/legacy-plugin-chart-paired-t-test';
-import ParallelCoordinatesChartPlugin from '@superset-ui/legacy-plugin-chart-parallel-coordinates';
-import PartitionChartPlugin from '@superset-ui/legacy-plugin-chart-partition';
-import PivotTableChartPlugin from '@superset-ui/legacy-plugin-chart-pivot-table';
-import RoseChartPlugin from '@superset-ui/legacy-plugin-chart-rose';
-import SankeyChartPlugin from '@superset-ui/legacy-plugin-chart-sankey';
-import SunburstChartPlugin from '@superset-ui/legacy-plugin-chart-sunburst';
-import TableChartPlugin from '@superset-ui/plugin-chart-table';
-import TreemapChartPlugin from '@superset-ui/legacy-plugin-chart-treemap';
-import { WordCloudChartPlugin } from '@superset-ui/plugin-chart-word-cloud';
-import WorldMapChartPlugin from '@superset-ui/legacy-plugin-chart-world-map';
-import {
-  AreaChartPlugin,
-  BarChartPlugin,
-  BubbleChartPlugin,
-  BulletChartPlugin,
-  CompareChartPlugin,
-  DistBarChartPlugin,
-  DualLineChartPlugin,
-  LineChartPlugin,
-  LineMultiChartPlugin,
-  TimePivotChartPlugin,
-} from '@superset-ui/legacy-preset-chart-nvd3';
-import { DeckGLChartPreset } from '@superset-ui/legacy-preset-chart-deckgl';
-import {
-  EchartsPieChartPlugin,
-  //EchartsBoxPlotChartPlugin,
-  EchartsAreaChartPlugin,
-  EchartsTimeseriesChartPlugin,
-  EchartsTimeseriesBarChartPlugin,
-  EchartsTimeseriesLineChartPlugin,
-  EchartsTimeseriesScatterChartPlugin,
-  EchartsTimeseriesSmoothLineChartPlugin,
-  EchartsTimeseriesStepChartPlugin,
-  EchartsGraphChartPlugin,
-  EchartsGaugeChartPlugin,
-  EchartsRadarChartPlugin,
-  EchartsFunnelChartPlugin,
-  EchartsTreemapChartPlugin,
-  EchartsMixedTimeseriesChartPlugin,
-  EchartsTreeChartPlugin,
-} from '@superset-ui/plugin-chart-echarts';
-import {
-  EchartsBoxPlotChartPlugin,
-} from '@superset-ui/plugin-chart-box-plot';
-import {
-  SelectFilterPlugin,
-  RangeFilterPlugin,
-  TimeFilterPlugin,
-  TimeColumnFilterPlugin,
-  TimeGrainFilterPlugin,
-  GroupByFilterPlugin,
-} from 'src/filters/components/';
-import { PivotTableChartPlugin as PivotTableChartPluginV2 } from '@superset-ui/plugin-chart-pivot-table';
-import FilterBoxChartPlugin from '../FilterBox/FilterBoxChartPlugin';
-import TimeTableChartPlugin from '../TimeTable/TimeTableChartPlugin';
-
-export default class MainPreset extends Preset {
-  constructor() {
-    const experimentalplugins = isFeatureEnabled(
-      FeatureFlag.DASHBOARD_FILTERS_EXPERIMENTAL,
-    )
-      ? [new GroupByFilterPlugin().configure({ key: 'filter_groupby' })]
-      : [];
-
-    super({
-      name: 'Legacy charts',
-      presets: [new DeckGLChartPreset()],
-      plugins: [
-        new AreaChartPlugin().configure({ key: 'area' }),
-        new BarChartPlugin().configure({ key: 'bar' }),
-        new BigNumberChartPlugin().configure({ key: 'big_number' }),
-        new BigNumberTotalChartPlugin().configure({ key: 'big_number_total' }),
-        new EchartsBoxPlotChartPlugin().configure({ key: 'box_plot' }),
-        new BubbleChartPlugin().configure({ key: 'bubble' }),
-        new BulletChartPlugin().configure({ key: 'bullet' }),
-        new CalendarChartPlugin().configure({ key: 'cal_heatmap' }),
-        new ChordChartPlugin().configure({ key: 'chord' }),
-        new CompareChartPlugin().configure({ key: 'compare' }),
-        new CountryMapChartPlugin().configure({ key: 'country_map' }),
-        new DistBarChartPlugin().configure({ key: 'dist_bar' }),
-        new DualLineChartPlugin().configure({ key: 'dual_line' }),
-        new EventFlowChartPlugin().configure({ key: 'event_flow' }),
-        new FilterBoxChartPlugin().configure({ key: 'filter_box' }),
-        new EchartsFunnelChartPlugin().configure({ key: 'funnel' }),
-        new EchartsTreemapChartPlugin().configure({ key: 'treemap_v2' }),
-        new EchartsGaugeChartPlugin().configure({ key: 'gauge_chart' }),
-        new EchartsGraphChartPlugin().configure({ key: 'graph_chart' }),
-        new EchartsRadarChartPlugin().configure({ key: 'radar' }),
-        new EchartsMixedTimeseriesChartPlugin().configure({
-          key: 'mixed_timeseries',
-        }),
-        new HeatmapChartPlugin().configure({ key: 'heatmap' }),
-        new HistogramChartPlugin().configure({ key: 'histogram' }),
-        new HorizonChartPlugin().configure({ key: 'horizon' }),
-        new LineChartPlugin().configure({ key: 'line' }),
-        new LineMultiChartPlugin().configure({ key: 'line_multi' }),
-        new MapBoxChartPlugin().configure({ key: 'mapbox' }),
-        new PairedTTestChartPlugin().configure({ key: 'paired_ttest' }),
-        new ParallelCoordinatesChartPlugin().configure({ key: 'para' }),
-        new PartitionChartPlugin().configure({ key: 'partition' }),
-        new EchartsPieChartPlugin().configure({ key: 'pie' }),
-        new PivotTableChartPlugin().configure({ key: 'pivot_table' }),
-        new PivotTableChartPluginV2().configure({ key: 'pivot_table_v2' }),
-        new RoseChartPlugin().configure({ key: 'rose' }),
-        new SankeyChartPlugin().configure({ key: 'sankey' }),
-        new SunburstChartPlugin().configure({ key: 'sunburst' }),
-        new TableChartPlugin().configure({ key: 'table' }),
-        new TimePivotChartPlugin().configure({ key: 'time_pivot' }),
-        new TimeTableChartPlugin().configure({ key: 'time_table' }),
-        new TreemapChartPlugin().configure({ key: 'treemap' }),
-        new WordCloudChartPlugin().configure({ key: 'word_cloud' }),
-        new WorldMapChartPlugin().configure({ key: 'world_map' }),
-        new EchartsAreaChartPlugin().configure({
-          key: 'echarts_area',
-        }),
-        new EchartsTimeseriesChartPlugin().configure({
-          key: 'echarts_timeseries',
-        }),
-        new EchartsTimeseriesBarChartPlugin().configure({
-          key: 'echarts_timeseries_bar',
-        }),
-        new EchartsTimeseriesLineChartPlugin().configure({
-          key: 'echarts_timeseries_line',
-        }),
-        new EchartsTimeseriesSmoothLineChartPlugin().configure({
-          key: 'echarts_timeseries_smooth',
-        }),
-        new EchartsTimeseriesScatterChartPlugin().configure({
-          key: 'echarts_timeseries_scatter',
-        }),
-        new EchartsTimeseriesStepChartPlugin().configure({
-          key: 'echarts_timeseries_step',
-        }),
-        new SelectFilterPlugin().configure({ key: 'filter_select' }),
-        new RangeFilterPlugin().configure({ key: 'filter_range' }),
-        new TimeFilterPlugin().configure({ key: 'filter_time' }),
-        new TimeColumnFilterPlugin().configure({ key: 'filter_timecolumn' }),
-        new TimeGrainFilterPlugin().configure({ key: 'filter_timegrain' }),
-        new EchartsTreeChartPlugin().configure({ key: 'tree_chart' }),
-        ...experimentalplugins,
-      ],
-    });
-  }
-}
diff --git a/superset/plugins/main_preset_has_changes.py b/superset/plugins/main_preset_has_changes.py
deleted file mode 100755
index 28772555..00000000
--- a/superset/plugins/main_preset_has_changes.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/python3
-
-import json
-import requests
-import sys
-
-response = requests.get(
-    "https://api.github.com/repos/apache/superset/commits?path=superset-frontend/src/visualizations/presets/MainPreset.js",
-    headers={"accept": "application/vnd.github.v3+json"},
-)
-
-if response.status_code == 200:
-    commits = response.json()
-    if not commits:
-        print("Commits list is empty", file=sys.stderr)
-    elif commits[0]["sha"] == "a59d458e415c7f66ed022928768040554ad9f356":
-        print("No changes were made to the MainPresets file")
-    else:
-        print("Changes were made to the MainPresets file", file=sys.stderr)
-else:
-    print("Unable to request commits history from github", file=sys.stderr)
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/README.md b/superset/plugins/plugins/plugin-chart-box-plot/README.md
deleted file mode 100644
index 6c23fd00..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-## @superset-ui/plugin-chart-box-plot
-
-Box Plot Chart with a raw mode. Based on the Box Plot present [here](https://github.com/apache-superset/superset-ui/tree/v0.17.84/plugins/plugin-chart-echarts)
-
-[![Version](https://img.shields.io/npm/v/@superset-ui/plugin-chart-echarts.svg?style=flat-square)](https://www.npmjs.com/package/@superset-ui/plugin-chart-echarts)
-[![David (path)](https://img.shields.io/david/apache-superset/superset-ui.svg?path=packages%2Fsuperset-ui-plugin-chart-echarts&style=flat-square)](https://david-dm.org/apache-superset/superset-ui?path=packages/superset-ui-plugin-chart-echarts)
-
-This plugin provides Echarts viz plugins for Superset:
-
-- Box Plot Chart
-
-### How to update
-
-1. Check what release version of the `@superset-ui/plugin-chart-echarts` npm plugin, superset is using (see the file at `superset-frontend/package.json`).
-
-2. If it is greater than 0.17.84, go to the [history](https://github.com/apache-superset/superset-ui/commits/master/plugins/plugin-chart-echarts) of commits done to the plugin-chart-echarts plugin of the superset-ui repository and update to the most recent commit that has the same version that is being used by your superset version. A fast way check the changes done between two commits: `git diff [old_commit_hash] [recent_commit_hash] -- plugins/plugin-chart-echarts`
-
-### Demo
-
-![demo](demo.png)
-
-Note the Data section:
-- Multiple column series are supported. Their value is then concatenated by adding `", "` between them.
-- Columns Min, P10, P25, Median, P75, P90 and Max are mandatory.
-- To add several outliers to the same box, you must have several rows with the same data but with different outlier values.
-
-### Usage
-
-Configure `key`, which can be any `string`, and register the plugin. This `key` will be used to
-lookup this chart throughout the app.
-
-```js
-import {
-  EchartsBoxPlotChartPlugin,
-} from '@superset-ui/plugin-chart-box-plot';
-
-new EchartsBoxPlotChartPlugin().configure({ key: 'box_plot' }).register();
-```
-
-Then use it via `SuperChart`.
-
-```js
-<SuperChart
-  chartType="echarts-ts"
-  width={600}
-  height={600}
-  formData={...}
-  queriesData={[{
-    data: {...},
-  }]}
-/>
-```
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/demo.png b/superset/plugins/plugins/plugin-chart-box-plot/demo.png
deleted file mode 100644
index d878129d..00000000
Binary files a/superset/plugins/plugins/plugin-chart-box-plot/demo.png and /dev/null differ
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/EchartsBoxPlot.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/EchartsBoxPlot.js
deleted file mode 100644
index 6c39d285..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/EchartsBoxPlot.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React, { useCallback } from 'react';
-import Echart from '../components/Echart';
-import { jsx as ___EmotionJSX } from "@emotion/react";
-export default function EchartsBoxPlot({
-  height,
-  width,
-  echartOptions,
-  setDataMask,
-  labelMap,
-  groupby,
-  selectedValues,
-  formData
-}) {
-  const handleChange = useCallback(values => {
-    if (!formData.emitFilter) {
-      return;
-    }
-
-    const groupbyValues = values.map(value => labelMap[value]);
-    setDataMask({
-      extraFormData: {
-        filters: values.length === 0 ? [] : groupby.map((col, idx) => {
-          const val = groupbyValues.map(v => v[idx]);
-          if (val === null || val === undefined) return {
-            col,
-            op: 'IS NULL'
-          };
-          return {
-            col,
-            op: 'IN',
-            val: val
-          };
-        })
-      },
-      filterState: {
-        value: groupbyValues.length ? groupbyValues : null,
-        selectedValues: values.length ? values : null
-      }
-    });
-  }, [groupby, labelMap, setDataMask, selectedValues]);
-  const eventHandlers = {
-    click: props => {
-      const {
-        name
-      } = props;
-      const values = Object.values(selectedValues);
-
-      if (values.includes(name)) {
-        handleChange(values.filter(v => v !== name));
-      } else {
-        handleChange([name]);
-      }
-    }
-  };
-  return ___EmotionJSX(Echart, {
-    height: height,
-    width: width,
-    echartOptions: echartOptions,
-    eventHandlers: eventHandlers,
-    selectedValues: selectedValues
-  });
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/buildQuery.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/buildQuery.js
deleted file mode 100644
index 05a9f84b..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/buildQuery.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { buildQueryContext, getMetricLabel } from '@superset-ui/core';
-const PERCENTILE_REGEX = /(\d+)\/(\d+) percentiles/;
-export default function buildQuery(formData) {
-  const {
-    query_mode,
-    groupby = [],
-    minimum,
-    p10,
-    p25,
-    median,
-    p75,
-    p90,
-    maximum,
-    whiskerOptions,
-    columns: distributionColumns = []
-  } = formData;
-  return buildQueryContext(formData, baseQueryObject => {
-    if (query_mode == 'raw') {
-      if (groupby.length == 0) {
-        throw new Error(`Error: No series column defined.`);
-      }
-
-      const missing_columns = ['minimum', 'p10', 'p25', 'median', 'p75', 'p90', 'maximum'].filter(c => !formData[c] || Array.isArray(formData[c])).map(c => c.toUpperCase());
-
-      if (missing_columns.length > 0) {
-        if (missing_columns.length > 1) {
-          throw new Error(`Error: Columns ${missing_columns.slice(0, missing_columns.length - 1).join(', ')} and ${missing_columns[missing_columns.length - 1]} are not defined.`);
-        } else {
-          throw new Error(`Error: Column ${missing_columns[0]} is not defined.`);
-        }
-      }
-
-      const {
-        outliers
-      } = formData;
-      const queries = [{ ...baseQueryObject,
-        metrics: [],
-        groupby: [],
-        columns: [...groupby, minimum, p10, p25, median, p75, p90, maximum]
-      }].concat(outliers && !Array.isArray(outliers) ? { ...baseQueryObject,
-        metrics: [],
-        groupby: [],
-        columns: [...groupby, outliers]
-      } : []);
-      return queries;
-    }
-
-    let whiskerType;
-    let percentiles;
-    const {
-      columns = [],
-      metrics = []
-    } = baseQueryObject;
-    const percentileMatch = PERCENTILE_REGEX.exec(whiskerOptions);
-
-    if (whiskerOptions === 'Tukey') {
-      whiskerType = 'tukey';
-    } else if (whiskerOptions === 'Min/max (no outliers)') {
-      whiskerType = 'min/max';
-    } else if (percentileMatch) {
-      whiskerType = 'percentile';
-      percentiles = [parseInt(percentileMatch[1], 10), parseInt(percentileMatch[2], 10)];
-    } else {
-      throw new Error(`Unsupported whisker type: ${whiskerOptions}`);
-    }
-
-    return [{ ...baseQueryObject,
-      is_timeseries: distributionColumns.length === 0,
-      post_processing: [{
-        operation: 'boxplot',
-        options: {
-          whisker_type: whiskerType,
-          percentiles,
-          groupby: columns.filter(x => !distributionColumns.includes(x)),
-          metrics: metrics.map(getMetricLabel)
-        }
-      }]
-    }];
-  });
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/controlPanel.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/controlPanel.js
deleted file mode 100644
index e4538149..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/controlPanel.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React from 'react';
-import { QueryMode, t } from '@superset-ui/core';
-import { ColumnOption, D3_FORMAT_DOCS, D3_FORMAT_OPTIONS, D3_TIME_FORMAT_OPTIONS, formatSelectOptions, sections, emitFilterControl, QueryModeLabel } from '@superset-ui/chart-controls';
-import { jsx as ___EmotionJSX } from "@emotion/react";
-
-function getQueryMode(controls) {
-  var _controls$query_mode, _controls$all_columns;
-
-  const mode = controls == null ? void 0 : (_controls$query_mode = controls.query_mode) == null ? void 0 : _controls$query_mode.value;
-
-  if (mode === QueryMode.aggregate || mode === QueryMode.raw) {
-    return mode;
-  }
-
-  const rawColumns = controls == null ? void 0 : (_controls$all_columns = controls.all_columns) == null ? void 0 : _controls$all_columns.value;
-  const hasRawColumns = rawColumns && rawColumns.length > 0;
-  return hasRawColumns ? QueryMode.raw : QueryMode.aggregate;
-}
-/**
- * Visibility check
- */
-
-
-function isQueryMode(mode) {
-  return ({
-    controls
-  }) => getQueryMode(controls) === mode;
-}
-
-const isAggMode = isQueryMode(QueryMode.aggregate);
-const isRawMode = isQueryMode(QueryMode.raw);
-const queryMode = {
-  type: 'RadioButtonControl',
-  label: t('Query mode'),
-  default: null,
-  options: [[QueryMode.aggregate, QueryModeLabel[QueryMode.aggregate]], [QueryMode.raw, QueryModeLabel[QueryMode.raw]]],
-  mapStateToProps: ({
-    controls
-  }) => ({
-    value: getQueryMode(controls)
-  })
-};
-const all_columns = {
-  type: 'SelectControl',
-  label: t('P90'),
-  description: t('Column holding the 90th percentile values'),
-  multi: false,
-  freeForm: false,
-  allowAll: true,
-  commaChoosesOption: false,
-  default: [],
-  optionRenderer: c => ___EmotionJSX(ColumnOption, {
-    showType: true,
-    column: c
-  }),
-  valueRenderer: c => ___EmotionJSX(ColumnOption, {
-    column: c
-  }),
-  valueKey: 'column_name',
-  mapStateToProps: ({
-    datasource,
-    controls
-  }) => ({
-    options: (datasource == null ? void 0 : datasource.columns) || [],
-    queryMode: getQueryMode(controls)
-  }),
-  visibility: isRawMode
-};
-export default {
-  controlPanelSections: [sections.legacyTimeseriesTime, {
-    label: t('Query'),
-    expanded: true,
-    controlSetRows: [[{
-      name: 'query_mode',
-      config: queryMode
-    }], [{
-      name: 'minimum',
-      config: { ...all_columns,
-        label: t('Min'),
-        description: t('Column holding the minimum values')
-      }
-    }], [{
-      name: 'p10',
-      config: { ...all_columns,
-        label: t('P10'),
-        description: t('Column holding the 10th percentile values')
-      }
-    }, {
-      name: 'p25',
-      config: { ...all_columns,
-        label: t('P25'),
-        description: t('Column holding the 25th percentile values')
-      }
-    }], [{
-      name: 'median',
-      config: { ...all_columns,
-        label: t('Median/P50'),
-        description: t('Column holding the median values')
-      }
-    }], [{
-      name: 'p75',
-      config: { ...all_columns,
-        label: t('P75'),
-        description: t('Column holding the 75th percentile values')
-      }
-    }, {
-      name: 'p90',
-      config: all_columns
-    }], [{
-      name: 'maximum',
-      config: { ...all_columns,
-        label: t('Max'),
-        description: t('Column holding the maximum values')
-      }
-    }], [{
-      name: 'outliers',
-      config: { ...all_columns,
-        label: t('Outliers'),
-        description: t('Column holding outliers values')
-      }
-    }], ['metrics'], ['adhoc_filters'], emitFilterControl, ['groupby'], ['columns'], ['limit'], [{
-      name: 'whiskerOptions',
-      config: {
-        type: 'SelectControl',
-        freeForm: true,
-        label: t('Whisker/outlier options'),
-        default: 'Tukey',
-        description: t('Determines how whiskers and outliers are calculated.'),
-        choices: formatSelectOptions(['Tukey', 'Min/max (no outliers)', '2/98 percentiles', '9/91 percentiles']),
-        visibility: isAggMode
-      }
-    }]]
-  }, {
-    label: t('Chart Options'),
-    expanded: true,
-    controlSetRows: [['color_scheme'], [{
-      name: 'x_ticks_layout',
-      config: {
-        type: 'SelectControl',
-        label: t('X Tick Layout'),
-        choices: formatSelectOptions(['auto', 'flat', '45°', '90°', 'staggered']),
-        default: 'auto',
-        clearable: false,
-        renderTrigger: true,
-        description: t('The way the ticks are laid out on the X-axis')
-      }
-    }], [{
-      name: 'number_format',
-      config: {
-        type: 'SelectControl',
-        freeForm: true,
-        label: t('Number format'),
-        renderTrigger: true,
-        default: 'SMART_NUMBER',
-        choices: D3_FORMAT_OPTIONS,
-        description: `${t('D3 format syntax: https://github.com/d3/d3-format')} ${t('Only applies when "Label Type" is set to show values.')}`
-      }
-    }], [{
-      name: 'date_format',
-      config: {
-        type: 'SelectControl',
-        freeForm: true,
-        label: t('Date format'),
-        renderTrigger: true,
-        choices: D3_TIME_FORMAT_OPTIONS,
-        default: 'smart_date',
-        description: D3_FORMAT_DOCS
-      }
-    }]]
-  }],
-  controlOverrides: {
-    groupby: {
-      label: t('Series'),
-      description: t('Categories to group by on the x-axis.'),
-      multi: true
-    },
-    columns: {
-      label: t('Distribute across'),
-      multi: true,
-      description: t('Columns to calculate distribution across. Defaults to temporal column if left empty.'),
-      visibility: isAggMode
-    },
-    metrics: {
-      visibility: isAggMode,
-      validators: []
-    }
-  }
-};
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/images/BoxPlot.jpg b/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/images/BoxPlot.jpg
deleted file mode 100644
index 9f1a181c..00000000
Binary files a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/images/BoxPlot.jpg and /dev/null differ
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/images/thumbnail.png b/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/images/thumbnail.png
deleted file mode 100644
index 4fa6ebce..00000000
Binary files a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/images/thumbnail.png and /dev/null differ
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/index.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/index.js
deleted file mode 100644
index 901b0df9..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/index.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { t, ChartMetadata, ChartPlugin, Behavior } from '@superset-ui/core';
-import buildQuery from './buildQuery';
-import controlPanel from './controlPanel';
-import transformProps from './transformProps';
-import example from './images/BoxPlot.jpg';
-import thumbnail from './images/thumbnail.png';
-export default class EchartsBoxPlotChartPlugin extends ChartPlugin {
-  /**
-   * The constructor is used to pass relevant metadata and callbacks that get
-   * registered in respective registries that are used throughout the library
-   * and application. A more thorough description of each property is given in
-   * the respective imported file.
-   *
-   * It is worth noting that `buildQuery` and is optional, and only needed for
-   * advanced visualizations that require either post processing operations
-   * (pivoting, rolling aggregations, sorting etc) or submitting multiple queries.
-   */
-  constructor() {
-    super({
-      buildQuery,
-      controlPanel,
-      loadChart: () => import('./EchartsBoxPlot'),
-      metadata: new ChartMetadata({
-        behaviors: [Behavior.INTERACTIVE_CHART],
-        category: t('Distribution'),
-        credits: ['https://echarts.apache.org'],
-        description: t('Also known as a box and whisker plot, this visualization compares the distributions of a related metric across multiple groups. The box in the middle emphasizes the mean, median, and inner 2 quartiles. The whiskers around each box visualize the min, max, range, and outer 2 quartiles.'),
-        exampleGallery: [{
-          url: example
-        }],
-        name: t('Box Plot'),
-        tags: [t('ECharts'), t('Range'), t('Statistical')],
-        thumbnail
-      }),
-      transformProps
-    });
-  }
-
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/transformProps.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/transformProps.js
deleted file mode 100644
index 03550055..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/transformProps.js
+++ /dev/null
@@ -1,277 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { CategoricalColorNamespace, getMetricLabel, getNumberFormatter, getTimeFormatter, QueryMode } from '@superset-ui/core';
-import { extractGroupbyLabel, getColtypesMapping, sanitizeHtml } from '../utils/series';
-import { defaultGrid, defaultTooltip, defaultYAxis } from '../defaults';
-import { OpacityEnum } from '../constants';
-import d3 from 'd3';
-export default function transformProps(chartProps) {
-  const {
-    width,
-    height,
-    formData,
-    hooks,
-    filterState,
-    queriesData
-  } = chartProps;
-  const {
-    data: original_data = []
-  } = queriesData[0];
-  const {
-    setDataMask = () => {}
-  } = hooks;
-  const coltypeMapping = getColtypesMapping(queriesData[0]);
-  const {
-    colorScheme,
-    queryMode,
-    groupby = [],
-    metrics: formdataMetrics = [],
-    numberFormat,
-    dateFormat,
-    xTicksLayout,
-    emitFilter
-  } = formData;
-  const colorFn = CategoricalColorNamespace.getScale(colorScheme);
-  const numberFormatter = getNumberFormatter(numberFormat);
-  let transformedData, outlierData;
-
-  if (queryMode == QueryMode.raw) {
-    const data = d3.nest().key(row => extractGroupbyLabel({
-      datum: row,
-      groupby,
-      coltypeMapping,
-      timeFormatter: getTimeFormatter(dateFormat)
-    })).entries(queriesData[0].data).reduce((result, item, _) => {
-      result[item.key] = item.values[0];
-      return result;
-    }, {});
-    const {
-      outliers
-    } = formData;
-    let outlierMapping;
-
-    if (outliers && !Array.isArray(outliers)) {
-      outlierMapping = d3.nest().key(row => extractGroupbyLabel({
-        datum: row,
-        groupby,
-        coltypeMapping,
-        timeFormatter: getTimeFormatter(dateFormat)
-      })).entries(queriesData[1].data).reduce((result, item, _) => {
-        const values = item.values.filter(v => v[outliers]);
-
-        if (values.length > 0) {
-          result[item.key] = values;
-        }
-
-        return result;
-      }, {});
-      outlierData = Object.entries(outlierMapping).map(([groupbyLabel, outlierDatum]) => {
-        const isFiltered = filterState.selectedValues && !filterState.selectedValues.includes(groupbyLabel);
-        return {
-          name: 'outlier',
-          type: 'scatter',
-          data: outlierDatum.map(val => [groupbyLabel, val[outliers]]),
-          tooltip: {
-            formatter: param => {
-              const [outlierName, stats] = param.data;
-              const headline = groupby ? `<p><strong>${sanitizeHtml(outlierName)}</strong></p>` : '';
-              return `${headline}${numberFormatter(stats)}`;
-            }
-          },
-          itemStyle: {
-            color: colorFn(groupbyLabel),
-            opacity: isFiltered ? OpacityEnum.SemiTransparent : OpacityEnum.NonTransparent
-          }
-        };
-      }).flat(2);
-    }
-
-    const {
-      minimum,
-      p10,
-      p25,
-      median,
-      p75,
-      p90,
-      maximum
-    } = formData;
-    transformedData = Object.entries(data).map(([groupByLabel, datum]) => {
-      const isFiltered = filterState.selectedValues && !filterState.selectedValues.includes(groupByLabel);
-      return {
-        name: groupByLabel,
-        value: [datum[p10], datum[p25], datum[median], datum[p75], datum[p90], datum[minimum], datum[maximum], outlierMapping ? groupByLabel in outlierMapping ? outlierMapping[groupByLabel] : [] : []],
-        itemStyle: {
-          color: colorFn(groupByLabel),
-          opacity: isFiltered ? OpacityEnum.SemiTransparent : 0.6,
-          borderColor: colorFn(groupByLabel)
-        }
-      };
-    }).flatMap(row => row);
-  } else {
-    const metricLabels = formdataMetrics.map(getMetricLabel);
-    transformedData = original_data.map(datum => {
-      const groupbyLabel = extractGroupbyLabel({
-        datum,
-        groupby,
-        coltypeMapping,
-        timeFormatter: getTimeFormatter(dateFormat)
-      });
-      return metricLabels.map(metric => {
-        const name = metricLabels.length === 1 ? groupbyLabel : `${groupbyLabel}, ${metric}`;
-        const isFiltered = filterState.selectedValues && !filterState.selectedValues.includes(name);
-        return {
-          name,
-          value: [datum[`${metric}__min`], datum[`${metric}__q1`], datum[`${metric}__median`], datum[`${metric}__q3`], datum[`${metric}__max`], datum[`${metric}__mean`], datum[`${metric}__count`], datum[`${metric}__outliers`]],
-          itemStyle: {
-            color: colorFn(groupbyLabel),
-            opacity: isFiltered ? OpacityEnum.SemiTransparent : 0.6,
-            borderColor: colorFn(groupbyLabel)
-          }
-        };
-      });
-    }).flatMap(row => row);
-    outlierData = original_data.map(datum => metricLabels.map(metric => {
-      const groupbyLabel = extractGroupbyLabel({
-        datum,
-        groupby,
-        coltypeMapping,
-        timeFormatter: getTimeFormatter(dateFormat)
-      });
-      const name = metricLabels.length === 1 ? groupbyLabel : `${groupbyLabel}, ${metric}`; // Outlier data is a nested array of numbers (uncommon, therefore no need to add to DataRecordValue)
-
-      const outlierDatum = datum[`${metric}__outliers`] || [];
-      const isFiltered = filterState.selectedValues && !filterState.selectedValues.includes(name);
-      return {
-        name: 'outlier',
-        type: 'scatter',
-        data: outlierDatum.map(val => [name, val]),
-        tooltip: {
-          formatter: param => {
-            const [outlierName, stats] = param.data;
-            const headline = groupby ? `<p><strong>${sanitizeHtml(outlierName)}</strong></p>` : '';
-            return `${headline}${numberFormatter(stats)}`;
-          }
-        },
-        itemStyle: {
-          color: colorFn(groupbyLabel),
-          opacity: isFiltered ? OpacityEnum.SemiTransparent : OpacityEnum.NonTransparent
-        }
-      };
-    })).flat(2);
-  }
-
-  const labelMap = original_data.reduce((acc, datum) => {
-    const label = extractGroupbyLabel({
-      datum,
-      groupby,
-      coltypeMapping,
-      timeFormatter: getTimeFormatter(dateFormat)
-    });
-    return { ...acc,
-      [label]: groupby.map(col => datum[col])
-    };
-  }, {});
-  const selectedValues = (filterState.selectedValues || []).reduce((acc, selectedValue) => {
-    const index = transformedData.findIndex(({
-      name
-    }) => name === selectedValue);
-    return { ...acc,
-      [index]: selectedValue
-    };
-  }, {});
-  let axisLabel;
-  if (xTicksLayout === '45°') axisLabel = {
-    rotate: -45
-  };else if (xTicksLayout === '90°') axisLabel = {
-    rotate: -90
-  };else if (xTicksLayout === 'flat') axisLabel = {
-    rotate: 0
-  };else if (xTicksLayout === 'staggered') axisLabel = {
-    rotate: -45
-  };else axisLabel = {
-    show: true
-  };
-  outlierData = outlierData || [];
-  const series = [{
-    name: 'boxplot',
-    type: 'boxplot',
-    data: transformedData,
-    tooltip: {
-      formatter: param => {
-        // @ts-ignore
-        const {
-          value,
-          name
-        } = param;
-        const headline = name ? `<p><strong>${sanitizeHtml(name)}</strong></p>` : '';
-        let stats;
-
-        if (queryMode == QueryMode.raw) {
-          stats = [`Max: ${numberFormatter(value[7])}`, `90th Percentile: ${numberFormatter(value[5])}`, `75th Percentile: ${numberFormatter(value[4])}`, `Median: ${numberFormatter(value[3])}`, `25th Percentile: ${numberFormatter(value[2])}`, `10th Percentile: ${numberFormatter(value[1])}`, `Min: ${numberFormatter(value[6])}`];
-        } else {
-          stats = [`Max: ${numberFormatter(value[5])}`, `3rd Quartile: ${numberFormatter(value[4])}`, `Mean: ${numberFormatter(value[6])}`, `Median: ${numberFormatter(value[3])}`, `1st Quartile: ${numberFormatter(value[2])}`, `Min: ${numberFormatter(value[1])}`, `# Observations: ${numberFormatter(value[7])}`];
-        }
-
-        if (value[8].length > 0) {
-          stats.push(`# Outliers: ${numberFormatter(value[8].length)}`);
-        }
-
-        return headline + stats.join('<br/>');
-      }
-    }
-  }, // @ts-ignore
-  ...outlierData];
-  const echartOptions = {
-    grid: { ...defaultGrid,
-      top: 30,
-      bottom: 30,
-      left: 20,
-      right: 20
-    },
-    xAxis: {
-      type: 'category',
-      data: transformedData.map(row => row.name),
-      axisLabel
-    },
-    yAxis: { ...defaultYAxis,
-      type: 'value',
-      axisLabel: {
-        formatter: numberFormatter
-      }
-    },
-    tooltip: { ...defaultTooltip,
-      trigger: 'item',
-      axisPointer: {
-        type: 'shadow'
-      }
-    },
-    series
-  };
-  return {
-    formData,
-    width,
-    height,
-    echartOptions,
-    setDataMask,
-    emitFilter,
-    labelMap,
-    groupby,
-    selectedValues
-  };
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/types.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/types.js
deleted file mode 100644
index c0117c5a..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/BoxPlot/types.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-// @ts-ignore
-export const DEFAULT_FORM_DATA = {
-  emitFilter: false
-};
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/Pie/types.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/Pie/types.js
deleted file mode 100644
index bc7d21b7..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/Pie/types.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { DEFAULT_LEGEND_FORM_DATA, LegendOrientation, LegendType } from '../types';
-export let EchartsPieLabelType; // @ts-ignore
-
-(function (EchartsPieLabelType) {
-  EchartsPieLabelType["Key"] = "key";
-  EchartsPieLabelType["Value"] = "value";
-  EchartsPieLabelType["Percent"] = "percent";
-  EchartsPieLabelType["KeyValue"] = "key_value";
-  EchartsPieLabelType["KeyPercent"] = "key_percent";
-  EchartsPieLabelType["KeyValuePercent"] = "key_value_percent";
-})(EchartsPieLabelType || (EchartsPieLabelType = {}));
-
-export const DEFAULT_FORM_DATA = { ...DEFAULT_LEGEND_FORM_DATA,
-  donut: false,
-  groupby: [],
-  innerRadius: 30,
-  labelLine: false,
-  labelType: EchartsPieLabelType.Key,
-  legendOrientation: LegendOrientation.Top,
-  legendType: LegendType.Scroll,
-  numberFormat: 'SMART_NUMBER',
-  outerRadius: 70,
-  showLabels: true,
-  labelsOutside: true,
-  showLabelsThreshold: 5,
-  emitFilter: false,
-  dateFormat: 'smart_date'
-};
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/components/Echart.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/components/Echart.js
deleted file mode 100644
index ce7f396f..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/components/Echart.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React, { useRef, useEffect } from 'react';
-import { styled } from '@superset-ui/core';
-import { init } from 'echarts';
-import { jsx as ___EmotionJSX } from "@emotion/react";
-const Styles = styled.div`
-  height: ${({
-  height
-}) => height};
-  width: ${({
-  width
-}) => width};
-`;
-export default function Echart({
-  width,
-  height,
-  echartOptions,
-  eventHandlers,
-  selectedValues = {}
-}) {
-  const divRef = useRef(null);
-  const chartRef = useRef();
-  const currentSelection = Object.keys(selectedValues) || [];
-  const previousSelection = useRef([]);
-  useEffect(() => {
-    if (!divRef.current) return;
-
-    if (!chartRef.current) {
-      chartRef.current = init(divRef.current);
-    }
-
-    Object.entries(eventHandlers || {}).forEach(([name, handler]) => {
-      var _chartRef$current, _chartRef$current2;
-
-      (_chartRef$current = chartRef.current) == null ? void 0 : _chartRef$current.off(name);
-      (_chartRef$current2 = chartRef.current) == null ? void 0 : _chartRef$current2.on(name, handler);
-    });
-    chartRef.current.setOption(echartOptions, true);
-    chartRef.current.dispatchAction({
-      type: 'downplay',
-      dataIndex: previousSelection.current.filter(value => !currentSelection.includes(value))
-    });
-
-    if (currentSelection.length) {
-      chartRef.current.dispatchAction({
-        type: 'highlight',
-        dataIndex: currentSelection
-      });
-    }
-
-    previousSelection.current = currentSelection;
-  }, [echartOptions, eventHandlers, selectedValues]);
-  useEffect(() => {
-    if (chartRef.current) {
-      chartRef.current.resize({
-        width,
-        height
-      });
-    }
-  }, [width, height]);
-  return ___EmotionJSX(Styles, {
-    ref: divRef,
-    height: height,
-    width: width
-  });
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/constants.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/constants.js
deleted file mode 100644
index b126b58a..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/constants.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-// eslint-disable-next-line import/prefer-default-export
-export const NULL_STRING = '<NULL>';
-export let OpacityEnum;
-
-(function (OpacityEnum) {
-  OpacityEnum[OpacityEnum["Transparent"] = 0] = "Transparent";
-  OpacityEnum[OpacityEnum["SemiTransparent"] = 0.3] = "SemiTransparent";
-  OpacityEnum[OpacityEnum["NonTransparent"] = 1] = "NonTransparent";
-})(OpacityEnum || (OpacityEnum = {}));
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/defaults.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/defaults.js
deleted file mode 100644
index cf0b0eb0..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/defaults.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-export const defaultGrid = {
-  containLabel: true
-};
-export const defaultTooltip = {
-  confine: true
-};
-export const defaultYAxis = {
-  scale: true
-};
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/index.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/index.js
deleted file mode 100644
index dc88251c..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-export { default as EchartsBoxPlotChartPlugin } from './BoxPlot';
-/**
- * Note: this file exports the default export from EchartsTimeseries.tsx.
- * If you want to export multiple visualization modules, you will need to
- * either add additional plugin folders (similar in structure to ./plugin)
- * OR export multiple instances of `ChartPlugin` extensions in ./plugin/index.ts
- * which in turn load exports from EchartsTimeseries.tsx
- */
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/types.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/types.js
deleted file mode 100644
index d7adef66..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/types.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-export let LegendOrientation;
-
-(function (LegendOrientation) {
-  LegendOrientation["Top"] = "top";
-  LegendOrientation["Bottom"] = "bottom";
-  LegendOrientation["Left"] = "left";
-  LegendOrientation["Right"] = "right";
-})(LegendOrientation || (LegendOrientation = {}));
-
-export let LegendType;
-
-(function (LegendType) {
-  LegendType["Scroll"] = "scroll";
-  LegendType["Plain"] = "plain";
-})(LegendType || (LegendType = {}));
-
-export const DEFAULT_LEGEND_FORM_DATA = {
-  legendMargin: null,
-  legendOrientation: LegendOrientation.Top,
-  legendType: LegendType.Scroll,
-  showLegend: false
-};
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/esm/utils/series.js b/superset/plugins/plugins/plugin-chart-box-plot/esm/utils/series.js
deleted file mode 100644
index 0e7f535c..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/esm/utils/series.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* eslint-disable no-underscore-dangle */
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { GenericDataType } from '@superset-ui/core';
-import { format } from 'echarts';
-import { NULL_STRING } from '../constants';
-export function formatSeriesName(name, {
-  numberFormatter,
-  timeFormatter,
-  coltype
-} = {}) {
-  if (name === undefined || name === null) {
-    return NULL_STRING;
-  }
-
-  if (typeof name === 'number') {
-    return numberFormatter ? numberFormatter(name) : name.toString();
-  }
-
-  if (typeof name === 'boolean') {
-    return name.toString();
-  }
-
-  if (name instanceof Date || coltype === GenericDataType.TEMPORAL) {
-    const d = name instanceof Date ? name : new Date(name);
-    return timeFormatter ? timeFormatter(d) : d.toISOString();
-  }
-
-  return name;
-}
-export const getColtypesMapping = ({
-  coltypes = [],
-  colnames = []
-}) => colnames.reduce((accumulator, item, index) => ({ ...accumulator,
-  [item]: coltypes[index]
-}), {});
-export function extractGroupbyLabel({
-  datum = {},
-  groupby,
-  numberFormatter,
-  timeFormatter,
-  coltypeMapping = {}
-}) {
-  return (groupby || []).map(val => formatSeriesName(datum[val], {
-    numberFormatter,
-    timeFormatter,
-    ...(coltypeMapping[val] && {
-      coltype: coltypeMapping[val]
-    })
-  })).join(', ');
-}
-export function sanitizeHtml(text) {
-  return format.encodeHTML(text);
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/package-lock.json b/superset/plugins/plugins/plugin-chart-box-plot/package-lock.json
deleted file mode 100644
index 43283ce7..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/package-lock.json
+++ /dev/null
@@ -1,402 +0,0 @@
-{
-  "name": "@superset-ui/plugin-chart-box-plot",
-  "version": "0.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@superset-ui/plugin-chart-box-plot",
-      "version": "0.0.0",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@superset-ui/chart-controls": "0.16.9",
-        "@superset-ui/core": "0.16.7",
-        "@types/echarts": "^4.6.3",
-        "echarts": "^5.0.0"
-      },
-      "peerDependencies": {
-        "react": "^16.13.1"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.10.3",
-      "license": "MIT",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "node_modules/@superset-ui/chart-controls": {
-      "version": "0.16.9",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@superset-ui/core": "0.16.7",
-        "lodash": "^4.17.15",
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-bootstrap": "*",
-        "react": "^16.13.1",
-        "react-bootstrap": "^0.33.1"
-      }
-    },
-    "node_modules/@superset-ui/core": {
-      "version": "0.16.7",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@babel/runtime": "^7.1.2",
-        "@emotion/core": "^10.0.28",
-        "@emotion/styled": "^10.0.27",
-        "@types/d3-format": "^1.3.0",
-        "@types/d3-interpolate": "^1.3.1",
-        "@types/d3-scale": "^2.1.1",
-        "@types/d3-time": "^1.0.9",
-        "@types/d3-time-format": "^2.1.0",
-        "@types/lodash": "^4.14.149",
-        "@types/rison": "0.0.6",
-        "@types/seedrandom": "^2.4.28",
-        "@vx/responsive": "^0.0.197",
-        "csstype": "^2.6.4",
-        "d3-format": "^1.3.2",
-        "d3-interpolate": "^1.4.0",
-        "d3-scale": "^3.0.0",
-        "d3-time": "^1.0.10",
-        "d3-time-format": "^2.2.0",
-        "emotion-theming": "^10.0.27",
-        "fetch-retry": "^4.0.1",
-        "jed": "^1.1.1",
-        "lodash": "^4.17.11",
-        "pretty-ms": "^7.0.0",
-        "react-error-boundary": "^1.2.5",
-        "reselect": "^4.0.0",
-        "rison": "^0.1.1",
-        "seedrandom": "^3.0.5",
-        "whatwg-fetch": "^3.0.0"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-bootstrap": "*",
-        "@types/react-loadable": "*",
-        "react": "^16.13.1",
-        "react-bootstrap": "^0.33.1",
-        "react-loadable": "^5.5.0"
-      }
-    },
-    "node_modules/@types/echarts": {
-      "version": "4.9.7",
-      "resolved": "https://registry.npmjs.org/@types/echarts/-/echarts-4.9.7.tgz",
-      "integrity": "sha512-+klqEur0+bh1UjR6EpGE023vxpqzPSk58X5JwVEIBu0NOYMaMPKeM/TMnbL43BlDUZv4xttZFdeDdOtFk/YwzQ==",
-      "dependencies": {
-        "@types/zrender": "*"
-      }
-    },
-    "node_modules/@types/zrender": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/zrender/-/zrender-4.0.0.tgz",
-      "integrity": "sha512-s89GOIeKFiod2KSqHkfd2rzx+T2DVu7ihZCBEBnhFrzvQPUmzvDSBot9Fi1DfMQm9Odg+rTqoMGC38RvrwJK2w=="
-    },
-    "node_modules/@vx/responsive": {
-      "version": "0.0.197",
-      "license": "MIT",
-      "dependencies": {
-        "@types/lodash": "^4.14.146",
-        "@types/react": "*",
-        "lodash": "^4.17.10",
-        "prop-types": "^15.6.1",
-        "resize-observer-polyfill": "1.5.1"
-      },
-      "peerDependencies": {
-        "react": "^15.0.0-0 || ^16.0.0-0"
-      }
-    },
-    "node_modules/d3-array": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.11.0.tgz",
-      "integrity": "sha512-26clcwmHQEdsLv34oNKq5Ia9tQ26Y/4HqS3dQzF42QBUqymZJ+9PORcN1G52bt37NsL2ABoX4lvyYZc+A9Y0zw==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
-    },
-    "node_modules/d3-interpolate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-      "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "d3-color": "1"
-      }
-    },
-    "node_modules/d3-scale": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-      "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "d3-array": "^2.3.0",
-        "d3-format": "1 - 2",
-        "d3-interpolate": "1.2.0 - 2",
-        "d3-time": "1 - 2",
-        "d3-time-format": "2 - 3"
-      }
-    },
-    "node_modules/d3-time-format": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-      "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "d3-time": "1"
-      }
-    },
-    "node_modules/echarts": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.0.2.tgz",
-      "integrity": "sha512-En0VYpc96nw2/2AZoBWPHsGi471zMublttj50kfFpYAeR4geup0Tj9iVgEXh7QYZFPnRiruDJEjcB5PXZ+BYzQ==",
-      "dependencies": {
-        "tslib": "2.0.3",
-        "zrender": "5.0.4"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "node_modules/react": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
-      "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
-      "peer": true,
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
-    },
-    "node_modules/zrender": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.0.4.tgz",
-      "integrity": "sha512-DJpy0yrHYY5CuH6vhb9IINWbjvBUe/56J8aH86Jb7O8rRPAYZ3M2E469Qf5B3EOIfM3o3aUrO5edRQfLJ+l1Qw==",
-      "dependencies": {
-        "tslib": "2.0.3"
-      }
-    }
-  },
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.10.3",
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@superset-ui/chart-controls": {
-      "version": "0.16.9",
-      "requires": {
-        "@superset-ui/core": "0.16.7",
-        "lodash": "^4.17.15",
-        "prop-types": "^15.7.2"
-      }
-    },
-    "@superset-ui/core": {
-      "version": "0.16.7",
-      "requires": {
-        "@babel/runtime": "^7.1.2",
-        "@emotion/core": "^10.0.28",
-        "@emotion/styled": "^10.0.27",
-        "@types/d3-format": "^1.3.0",
-        "@types/d3-interpolate": "^1.3.1",
-        "@types/d3-scale": "^2.1.1",
-        "@types/d3-time": "^1.0.9",
-        "@types/d3-time-format": "^2.1.0",
-        "@types/lodash": "^4.14.149",
-        "@types/rison": "0.0.6",
-        "@types/seedrandom": "^2.4.28",
-        "@vx/responsive": "^0.0.197",
-        "csstype": "^2.6.4",
-        "d3-format": "^1.3.2",
-        "d3-interpolate": "^1.4.0",
-        "d3-scale": "^3.0.0",
-        "d3-time": "^1.0.10",
-        "d3-time-format": "^2.2.0",
-        "emotion-theming": "^10.0.27",
-        "fetch-retry": "^4.0.1",
-        "jed": "^1.1.1",
-        "lodash": "^4.17.11",
-        "pretty-ms": "^7.0.0",
-        "react-error-boundary": "^1.2.5",
-        "reselect": "^4.0.0",
-        "rison": "^0.1.1",
-        "seedrandom": "^3.0.5",
-        "whatwg-fetch": "^3.0.0"
-      }
-    },
-    "@types/echarts": {
-      "version": "4.9.7",
-      "resolved": "https://registry.npmjs.org/@types/echarts/-/echarts-4.9.7.tgz",
-      "integrity": "sha512-+klqEur0+bh1UjR6EpGE023vxpqzPSk58X5JwVEIBu0NOYMaMPKeM/TMnbL43BlDUZv4xttZFdeDdOtFk/YwzQ==",
-      "requires": {
-        "@types/zrender": "*"
-      }
-    },
-    "@types/zrender": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/zrender/-/zrender-4.0.0.tgz",
-      "integrity": "sha512-s89GOIeKFiod2KSqHkfd2rzx+T2DVu7ihZCBEBnhFrzvQPUmzvDSBot9Fi1DfMQm9Odg+rTqoMGC38RvrwJK2w=="
-    },
-    "@vx/responsive": {
-      "version": "0.0.197",
-      "requires": {
-        "@types/lodash": "^4.14.146",
-        "@types/react": "*",
-        "lodash": "^4.17.10",
-        "prop-types": "^15.6.1",
-        "resize-observer-polyfill": "1.5.1"
-      }
-    },
-    "d3-array": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.11.0.tgz",
-      "integrity": "sha512-26clcwmHQEdsLv34oNKq5Ia9tQ26Y/4HqS3dQzF42QBUqymZJ+9PORcN1G52bt37NsL2ABoX4lvyYZc+A9Y0zw==",
-      "requires": {
-        "internmap": "^1.0.0"
-      }
-    },
-    "d3-interpolate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-      "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-      "requires": {
-        "d3-color": "1"
-      }
-    },
-    "d3-scale": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-      "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-      "requires": {
-        "d3-array": "^2.3.0",
-        "d3-format": "1 - 2",
-        "d3-interpolate": "1.2.0 - 2",
-        "d3-time": "1 - 2",
-        "d3-time-format": "2 - 3"
-      }
-    },
-    "d3-time-format": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-      "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-      "requires": {
-        "d3-time": "1"
-      }
-    },
-    "echarts": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.0.2.tgz",
-      "integrity": "sha512-En0VYpc96nw2/2AZoBWPHsGi471zMublttj50kfFpYAeR4geup0Tj9iVgEXh7QYZFPnRiruDJEjcB5PXZ+BYzQ==",
-      "requires": {
-        "tslib": "2.0.3",
-        "zrender": "5.0.4"
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "react": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
-      "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
-      "peer": true,
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2"
-      }
-    },
-    "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
-    },
-    "zrender": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.0.4.tgz",
-      "integrity": "sha512-DJpy0yrHYY5CuH6vhb9IINWbjvBUe/56J8aH86Jb7O8rRPAYZ3M2E469Qf5B3EOIfM3o3aUrO5edRQfLJ+l1Qw==",
-      "requires": {
-        "tslib": "2.0.3"
-      }
-    }
-  }
-}
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/package.json b/superset/plugins/plugins/plugin-chart-box-plot/package.json
deleted file mode 100644
index 6c121541..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/package.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": "@superset-ui/plugin-chart-box-plot",
-  "version": "0.0.0",
-  "description": "Superset Chart - Echarts Box Plot",
-  "sideEffects": false,
-  "main": "lib/index.js",
-  "module": "esm/index.js",
-  "files": [
-    "esm",
-    "lib"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
-  },
-  "keywords": [
-    "superset"
-  ],
-  "author": "Superset",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
-  },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
-  "publishConfig": {
-    "access": "public"
-  },
-  "dependencies": {
-    "@superset-ui/chart-controls": "0.17.84",
-    "@superset-ui/core": "0.17.81",
-    "echarts": "^5.1.2"
-  },
-  "peerDependencies": {
-    "react": "^16.13.1"
-  }
-}
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/EchartsBoxPlot.tsx b/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/EchartsBoxPlot.tsx
deleted file mode 100644
index 05d8b59e..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/EchartsBoxPlot.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React, { useCallback } from 'react';
-import Echart from '../components/Echart';
-import { EventHandlers } from '../types';
-import { BoxPlotChartTransformedProps } from './types';
-
-export default function EchartsBoxPlot({
-  height,
-  width,
-  echartOptions,
-  setDataMask,
-  labelMap,
-  groupby,
-  selectedValues,
-  formData,
-}: BoxPlotChartTransformedProps) {
-  const handleChange = useCallback(
-    (values: string[]) => {
-      if (!formData.emitFilter) {
-        return;
-      }
-
-      const groupbyValues = values.map(value => labelMap[value]);
-
-      setDataMask({
-        extraFormData: {
-          filters:
-            values.length === 0
-              ? []
-              : groupby.map((col, idx) => {
-                  const val = groupbyValues.map(v => v[idx]);
-                  if (val === null || val === undefined)
-                    return {
-                      col,
-                      op: 'IS NULL',
-                    };
-                  return {
-                    col,
-                    op: 'IN',
-                    val: val as (string | number | boolean)[],
-                  };
-                }),
-        },
-        filterState: {
-          value: groupbyValues.length ? groupbyValues : null,
-          selectedValues: values.length ? values : null,
-        },
-      });
-    },
-    [groupby, labelMap, setDataMask, selectedValues],
-  );
-
-  const eventHandlers: EventHandlers = {
-    click: props => {
-      const { name } = props;
-      const values = Object.values(selectedValues);
-      if (values.includes(name)) {
-        handleChange(values.filter(v => v !== name));
-      } else {
-        handleChange([name]);
-      }
-    },
-  };
-
-  return (
-    <Echart
-      height={height}
-      width={width}
-      echartOptions={echartOptions}
-      eventHandlers={eventHandlers}
-      selectedValues={selectedValues}
-    />
-  );
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/buildQuery.ts b/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/buildQuery.ts
deleted file mode 100644
index b769d7ef..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/buildQuery.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { buildQueryContext, getMetricLabel } from '@superset-ui/core';
-import { BoxPlotQueryFormData, BoxPlotQueryObjectWhiskerType } from './types';
-
-const PERCENTILE_REGEX = /(\d+)\/(\d+) percentiles/;
-
-export default function buildQuery(formData: BoxPlotQueryFormData) {
-  const {
-    query_mode,
-    groupby = [],
-    minimum,
-    p10,
-    p25,
-    median,
-    p75,
-    p90,
-    maximum,
-    whiskerOptions,
-    columns: distributionColumns = [],
-  } = formData;
-  return buildQueryContext(formData, baseQueryObject => {
-    if (query_mode == 'raw') {
-      if (groupby.length == 0) {
-        throw new Error(`Error: No series column defined.`);
-      }
-
-      const missing_columns = ['minimum', 'p10', 'p25', 'median', 'p75', 'p90', 'maximum']
-        .filter(c => !formData[c] || Array.isArray(formData[c]))
-        .map(c => c.toUpperCase());
-      if (missing_columns.length > 0) {
-        if (missing_columns.length > 1) {
-          throw new Error(`Error: Columns ${missing_columns.slice(0, missing_columns.length - 1).join(', ')} and ${missing_columns[missing_columns.length - 1]} are not defined.`);
-        }
-        else {
-          throw new Error(`Error: Column ${missing_columns[0]} is not defined.`);
-        }
-      }
-
-      const { outliers } = formData;
-
-      const queries = [
-        {
-          ...baseQueryObject,
-          metrics: [],
-          groupby: [],
-          columns: [...groupby, minimum, p10, p25, median, p75, p90, maximum],
-        },
-      ].concat(
-        outliers && !Array.isArray(outliers)
-        ? {
-          ...baseQueryObject,
-          metrics: [],
-          groupby: [],
-          columns: [...groupby, outliers],
-        }
-        : []
-      );
-
-      return queries;
-    }
-
-    let whiskerType: BoxPlotQueryObjectWhiskerType;
-    let percentiles: [number, number] | undefined;
-    const { columns = [], metrics = [] } = baseQueryObject;
-    const percentileMatch = PERCENTILE_REGEX.exec(whiskerOptions as string);
-
-    if (whiskerOptions === 'Tukey') {
-      whiskerType = 'tukey';
-    } else if (whiskerOptions === 'Min/max (no outliers)') {
-      whiskerType = 'min/max';
-    } else if (percentileMatch) {
-      whiskerType = 'percentile';
-      percentiles = [parseInt(percentileMatch[1], 10), parseInt(percentileMatch[2], 10)];
-    } else {
-      throw new Error(`Unsupported whisker type: ${whiskerOptions}`);
-    }
-    return [
-      {
-        ...baseQueryObject,
-        is_timeseries: distributionColumns.length === 0,
-        post_processing: [
-          {
-            operation: 'boxplot',
-            options: {
-              whisker_type: whiskerType,
-              percentiles,
-              groupby: columns.filter(x => !distributionColumns.includes(x)),
-              metrics: metrics.map(getMetricLabel),
-            },
-          },
-        ],
-      },
-    ];
-  });
-}
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/images/BoxPlot.jpg b/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/images/BoxPlot.jpg
deleted file mode 100644
index 9f1a181c..00000000
Binary files a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/images/BoxPlot.jpg and /dev/null differ
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/images/thumbnail.png b/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/images/thumbnail.png
deleted file mode 100644
index 4fa6ebce..00000000
Binary files a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/images/thumbnail.png and /dev/null differ
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/index.ts b/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/index.ts
deleted file mode 100644
index c97dffe5..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/BoxPlot/index.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { t, ChartMetadata, ChartPlugin, Behavior } from '@superset-ui/core';
-import buildQuery from './buildQuery';
-import controlPanel from './controlPanel';
-import transformProps from './transformProps';
-import example from './images/BoxPlot.jpg';
-import thumbnail from './images/thumbnail.png';
-import { BoxPlotQueryFormData, EchartsBoxPlotChartProps } from './types';
-
-export default class EchartsBoxPlotChartPlugin extends ChartPlugin<
-  BoxPlotQueryFormData,
-  EchartsBoxPlotChartProps
-> {
-  /**
-   * The constructor is used to pass relevant metadata and callbacks that get
-   * registered in respective registries that are used throughout the library
-   * and application. A more thorough description of each property is given in
-   * the respective imported file.
-   *
-   * It is worth noting that `buildQuery` and is optional, and only needed for
-   * advanced visualizations that require either post processing operations
-   * (pivoting, rolling aggregations, sorting etc) or submitting multiple queries.
-   */
-  constructor() {
-    super({
-      buildQuery,
-      controlPanel,
-      loadChart: () => import('./EchartsBoxPlot'),
-      metadata: new ChartMetadata({
-        behaviors: [Behavior.INTERACTIVE_CHART],
-        category: t('Distribution'),
-        credits: ['https://echarts.apache.org'],
-        description: t(
-          'Also known as a box and whisker plot, this visualization compares the distributions of a related metric across multiple groups. The box in the middle emphasizes the mean, median, and inner 2 quartiles. The whiskers around each box visualize the min, max, range, and outer 2 quartiles.',
-        ),
-        exampleGallery: [{ url: example }],
-        name: t('Box Plot'),
-        tags: [t('ECharts'), t('Range'), t('Statistical')],
-        thumbnail,
-      }),
-      transformProps,
-    });
-  }
-}
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/Pie/types.ts b/superset/plugins/plugins/plugin-chart-box-plot/src/Pie/types.ts
deleted file mode 100644
index ee2efc06..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/Pie/types.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import {
-  QueryFormData,
-} from '@superset-ui/core';
-import {
-  DEFAULT_LEGEND_FORM_DATA,
-  EchartsLegendFormData,
-  LegendOrientation,
-  LegendType,
-} from '../types';
-
-export type EchartsPieFormData = QueryFormData &
-  EchartsLegendFormData & {
-    colorScheme?: string;
-    currentOwnValue?: string[] | null;
-    donut: boolean;
-    defaultValue?: string[] | null;
-    groupby: string[];
-    innerRadius: number;
-    labelLine: boolean;
-    labelType: EchartsPieLabelType;
-    labelsOutside: boolean;
-    metric?: string;
-    outerRadius: number;
-    showLabels: boolean;
-    numberFormat: string;
-    dateFormat: string;
-    showLabelsThreshold: number;
-    emitFilter: boolean;
-  };
-
-export enum EchartsPieLabelType {
-  Key = 'key',
-  Value = 'value',
-  Percent = 'percent',
-  KeyValue = 'key_value',
-  KeyPercent = 'key_percent',
-  KeyValuePercent = 'key_value_percent',
-}
-
-// @ts-ignore
-export const DEFAULT_FORM_DATA: EchartsPieFormData = {
-    ...DEFAULT_LEGEND_FORM_DATA,
-    donut: false,
-    groupby: [],
-    innerRadius: 30,
-    labelLine: false,
-    labelType: EchartsPieLabelType.Key,
-    legendOrientation: LegendOrientation.Top,
-    legendType: LegendType.Scroll,
-    numberFormat: 'SMART_NUMBER',
-    outerRadius: 70,
-    showLabels: true,
-    labelsOutside: true,
-    showLabelsThreshold: 5,
-    emitFilter: false,
-    dateFormat: 'smart_date',
-  };
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/components/Echart.tsx b/superset/plugins/plugins/plugin-chart-box-plot/src/components/Echart.tsx
deleted file mode 100644
index 84f61acb..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/components/Echart.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React, { useRef, useEffect } from 'react';
-import { styled } from '@superset-ui/core';
-import { ECharts, init } from 'echarts';
-import { EchartsProps, EchartsStylesProps } from '../types';
-
-const Styles = styled.div<EchartsStylesProps>`
-  height: ${({ height }) => height};
-  width: ${({ width }) => width};
-`;
-
-export default function Echart({
-  width,
-  height,
-  echartOptions,
-  eventHandlers,
-  selectedValues = {},
-}: EchartsProps) {
-  const divRef = useRef<HTMLDivElement>(null);
-  const chartRef = useRef<ECharts>();
-  const currentSelection = Object.keys(selectedValues) || [];
-  const previousSelection = useRef<string[]>([]);
-
-  useEffect(() => {
-    if (!divRef.current) return;
-    if (!chartRef.current) {
-      chartRef.current = init(divRef.current);
-    }
-    Object.entries(eventHandlers || {}).forEach(([name, handler]) => {
-      chartRef.current?.off(name);
-      chartRef.current?.on(name, handler);
-    });
-
-    chartRef.current.setOption(echartOptions, true);
-
-    chartRef.current.dispatchAction({
-      type: 'downplay',
-      dataIndex: previousSelection.current.filter(value => !currentSelection.includes(value)),
-    });
-    if (currentSelection.length) {
-      chartRef.current.dispatchAction({
-        type: 'highlight',
-        dataIndex: currentSelection,
-      });
-    }
-    previousSelection.current = currentSelection;
-}, [echartOptions, eventHandlers, selectedValues]);
-
-  useEffect(() => {
-    if (chartRef.current) {
-      chartRef.current.resize({ width, height });
-    }
-  }, [width, height]);
-
-  return <Styles ref={divRef} height={height} width={width} />;
-}
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/constants.ts b/superset/plugins/plugins/plugin-chart-box-plot/src/constants.ts
deleted file mode 100644
index 24464535..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/constants.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-// eslint-disable-next-line import/prefer-default-export
-export const NULL_STRING = '<NULL>';
-
-export enum OpacityEnum {
-  Transparent = 0,
-  SemiTransparent = 0.3,
-  NonTransparent = 1,
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/defaults.ts b/superset/plugins/plugins/plugin-chart-box-plot/src/defaults.ts
deleted file mode 100644
index 6671aa4a..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/defaults.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-export const defaultGrid = {
-  containLabel: true,
-};
-
-export const defaultTooltip = {
-  confine: true,
-};
-
-export const defaultYAxis = {
-  scale: true,
-};
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/index.ts b/superset/plugins/plugins/plugin-chart-box-plot/src/index.ts
deleted file mode 100644
index 4ea82414..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/index.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-export { default as EchartsBoxPlotChartPlugin } from './BoxPlot';
-
-/**
- * Note: this file exports the default export from EchartsTimeseries.tsx.
- * If you want to export multiple visualization modules, you will need to
- * either add additional plugin folders (similar in structure to ./plugin)
- * OR export multiple instances of `ChartPlugin` extensions in ./plugin/index.ts
- * which in turn load exports from EchartsTimeseries.tsx
- */
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/types.ts b/superset/plugins/plugins/plugin-chart-box-plot/src/types.ts
deleted file mode 100644
index e9ae0f25..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/types.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { EChartsOption } from 'echarts';
-
-export type EchartsStylesProps = {
-  height: number;
-  width: number;
-};
-
-export interface EchartsProps {
-  height: number;
-  width: number;
-  echartOptions: EChartsOption;
-  eventHandlers?: EventHandlers;
-  selectedValues?: Record<number, string>;
-  forceClear?: boolean;
-}
-
-export enum LegendOrientation {
-  Top = 'top',
-  Bottom = 'bottom',
-  Left = 'left',
-  Right = 'right',
-}
-
-export enum LegendType {
-  Scroll = 'scroll',
-  Plain = 'plain',
-}
-
-export type EchartsLegendFormData = {
-  legendMargin: number | null | string;
-  legendOrientation: LegendOrientation;
-  legendType: LegendType;
-  showLegend: boolean;
-};
-
-export const DEFAULT_LEGEND_FORM_DATA: EchartsLegendFormData = {
-  legendMargin: null,
-  legendOrientation: LegendOrientation.Top,
-  legendType: LegendType.Scroll,
-  showLegend: false,
-};
-
-export type EventHandlers = Record<string, { (props: any): void }>;
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/src/utils/series.ts b/superset/plugins/plugins/plugin-chart-box-plot/src/utils/series.ts
deleted file mode 100644
index ab04b7f1..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/src/utils/series.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/* eslint-disable no-underscore-dangle */
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import {
-  ChartDataResponseResult,
-  DataRecord,
-  DataRecordValue,
-  GenericDataType,
-  NumberFormatter,
-  TimeFormatter,
-} from '@superset-ui/core';
-import { format } from 'echarts';
-import { NULL_STRING } from '../constants';
-
-export function formatSeriesName(
-  name: DataRecordValue | undefined,
-  {
-    numberFormatter,
-    timeFormatter,
-    coltype,
-  }: {
-    numberFormatter?: NumberFormatter;
-    timeFormatter?: TimeFormatter;
-    coltype?: GenericDataType;
-  } = {},
-): string {
-  if (name === undefined || name === null) {
-    return NULL_STRING;
-  }
-  if (typeof name === 'number') {
-    return numberFormatter ? numberFormatter(name) : name.toString();
-  }
-  if (typeof name === 'boolean') {
-    return name.toString();
-  }
-  if (name instanceof Date || coltype === GenericDataType.TEMPORAL) {
-      const d = name instanceof Date ? name : new Date(name);
-  
-      return timeFormatter ? timeFormatter(d) : d.toISOString();
-  }
-  return name;
-}
-
-export const getColtypesMapping = ({
-  coltypes = [],
-  colnames = [],
-}: ChartDataResponseResult): Record<string, GenericDataType> =>
-  colnames.reduce((accumulator, item, index) => ({ ...accumulator, [item]: coltypes[index] }), {});
-
-export function extractGroupbyLabel({
-  datum = {},
-  groupby,
-  numberFormatter,
-  timeFormatter,
-  coltypeMapping = {},
-}: {
-  datum?: DataRecord;
-  groupby?: string[] | null;
-  numberFormatter?: NumberFormatter;
-  timeFormatter?: TimeFormatter;
-  coltypeMapping: Record<string, GenericDataType>;
-}): string {
-  return (groupby || [])
-    .map(val =>
-      formatSeriesName(datum[val], {
-        numberFormatter,
-        timeFormatter,
-        ...(coltypeMapping[val] && { coltype: coltypeMapping[val] }),
-      }),
-    )
-    .join(', ');
-}
-
-export function sanitizeHtml(text: string): string {
-  return format.encodeHTML(text);
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/test/BoxPlot/buildQuery.test.ts b/superset/plugins/plugins/plugin-chart-box-plot/test/BoxPlot/buildQuery.test.ts
deleted file mode 100644
index 50eb5230..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/test/BoxPlot/buildQuery.test.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import buildQuery from '../../src/BoxPlot/buildQuery';
-import { BoxPlotQueryFormData } from '../../src/BoxPlot/types';
-
-describe('BoxPlot buildQuery', () => {
-  const formData: BoxPlotQueryFormData = {
-    datasource: '5__table',
-    granularity_sqla: 'ds',
-    time_grain_sqla: 'P1Y',
-    columns: [],
-    metrics: ['foo'],
-    groupby: ['bar'],
-    whiskerOptions: 'Tukey',
-    yAxisFormat: 'SMART_NUMBER',
-    viz_type: 'my_chart',
-  };
-
-  it('should build timeseries when columns is empty', () => {
-    const queryContext = buildQuery(formData);
-    const [query] = queryContext.queries;
-    expect(query.is_timeseries).toEqual(true);
-    expect(query.metrics).toEqual(['foo']);
-    expect(query.columns).toEqual(['bar']);
-  });
-
-  it('should build non-timeseries query object when columns is defined', () => {
-    const queryContext = buildQuery({ ...formData, columns: ['qwerty'] });
-    const [query] = queryContext.queries;
-    expect(query.is_timeseries).toEqual(false);
-    expect(query.metrics).toEqual(['foo']);
-    expect(query.columns).toEqual(['qwerty', 'bar']);
-  });
-});
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/test/index.test.ts b/superset/plugins/plugins/plugin-chart-box-plot/test/index.test.ts
deleted file mode 100644
index dec9d8b5..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/test/index.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { EchartsBoxPlotChartPlugin } from '../src';
-
-describe('@superset-ui/plugin-chart-echarts', () => {
-  it('exists', () => {
-    expect(EchartsBoxPlotChartPlugin).toBeDefined();
-  });
-});
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/test/tsconfig.json b/superset/plugins/plugins/plugin-chart-box-plot/test/tsconfig.json
deleted file mode 100644
index b3b91dfc..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/test/tsconfig.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "compilerOptions": {
-    "composite": false,
-    "emitDeclarationOnly": false,
-    "noEmit": true,
-    "rootDir": "."
-  },
-  "extends": "../../../tsconfig.options.json",
-  "include": [
-    "**/*",
-    "../types/**/*",
-    "../../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": "../../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../../packages/superset-ui-core"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/test/utils/series.test.ts b/superset/plugins/plugins/plugin-chart-box-plot/test/utils/series.test.ts
deleted file mode 100644
index 53a2da40..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/test/utils/series.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { getNumberFormatter, getTimeFormatter } from '@superset-ui/core';
-import {
-  extractGroupbyLabel,
-  formatSeriesName,
-  sanitizeHtml,
-} from '../../src/utils/series';
-import { NULL_STRING } from '../../lib/constants';
-
-describe('extractGroupbyLabel', () => {
-  it('should join together multiple groupby labels', () => {
-    expect(extractGroupbyLabel({ datum: { a: 'abc', b: 'qwerty' }, groupby: ['a', 'b'] })).toEqual(
-      'abc, qwerty',
-    );
-  });
-
-  it('should handle a single groupby', () => {
-    expect(extractGroupbyLabel({ datum: { xyz: 'qqq' }, groupby: ['xyz'] })).toEqual('qqq');
-  });
-
-  it('should handle mixed types', () => {
-    expect(
-      extractGroupbyLabel({
-        datum: { strcol: 'abc', intcol: 123, floatcol: 0.123, boolcol: true },
-        groupby: ['strcol', 'intcol', 'floatcol', 'boolcol'],
-      }),
-    ).toEqual('abc, 123, 0.123, true');
-  });
-
-  it('should handle null and undefined groupby', () => {
-    expect(
-      extractGroupbyLabel({
-        datum: { strcol: 'abc', intcol: 123, floatcol: 0.123, boolcol: true },
-        groupby: null,
-      }),
-    ).toEqual('');
-    expect(extractGroupbyLabel({})).toEqual('');
-  });
-});
-
-describe('formatSeriesName', () => {
-  const numberFormatter = getNumberFormatter();
-  const timeFormatter = getTimeFormatter();
-  it('should handle missing values properly', () => {
-    expect(formatSeriesName(undefined)).toEqual('<NULL>');
-    expect(formatSeriesName(null)).toEqual('<NULL>');
-  });
-
-  it('should handle string values properly', () => {
-    expect(formatSeriesName('abc XYZ!')).toEqual('abc XYZ!');
-  });
-
-  it('should handle boolean values properly', () => {
-    expect(formatSeriesName(true)).toEqual('true');
-  });
-
-  it('should use default formatting for numeric values without formatter', () => {
-    expect(formatSeriesName(12345678.9)).toEqual('12345678.9');
-  });
-
-  it('should use numberFormatter for numeric values when formatter is provided', () => {
-    expect(formatSeriesName(12345678.9, { numberFormatter })).toEqual('12.3M');
-  });
-
-  it('should use default formatting for for date values without formatter', () => {
-    expect(formatSeriesName(new Date('2020-09-11'))).toEqual('2020-09-11T00:00:00.000Z');
-  });
-
-  it('should use timeFormatter for date values when formatter is provided', () => {
-    expect(formatSeriesName(new Date('2020-09-11'), { timeFormatter })).toEqual(
-      '2020-09-11 00:00:00',
-    );
-  });
-});
-
-describe('sanitizeHtml', () => {
-  it('should remove html tags from series name', () => {
-    expect(sanitizeHtml(NULL_STRING)).toEqual('&lt;NULL&gt;');
-  });
-});
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/tsconfig.json b/superset/plugins/plugins/plugin-chart-box-plot/tsconfig.json
deleted file mode 100644
index 40f75135..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "declarationDir": "lib",
-    "outDir": "lib",
-    "rootDir": "src"
-  },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "extends": "../../tsconfig.options.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/superset/plugins/plugins/plugin-chart-box-plot/types/external.d.ts b/superset/plugins/plugins/plugin-chart-box-plot/types/external.d.ts
deleted file mode 100644
index c9edbc66..00000000
--- a/superset/plugins/plugins/plugin-chart-box-plot/types/external.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare module '*.png' {
-  const value: any;
-  export default value;
-}
-
-declare module '*.jpg';
\ No newline at end of file
diff --git a/superset/plugins/setupPluginsExtra.ts b/superset/plugins/setupPluginsExtra.ts
deleted file mode 100644
index 217e7225..00000000
--- a/superset/plugins/setupPluginsExtra.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import {
-  EchartsBoxPlotChartPlugin,
-} from '@superset-ui/plugin-chart-box-plot';
-
-// For individual deployments to add custom overrides
-export default function setupPluginsExtra() {
-  new EchartsBoxPlotChartPlugin()
-    .configure({ key: 'box_plot' })
-    .register();
-}
diff --git a/superset/repo b/superset/repo
index 286ba5d3..48f3eb42 160000
--- a/superset/repo
+++ b/superset/repo
@@ -1 +1 @@
-Subproject commit 286ba5d37d4e240d01bbefd2307a816829cf512d
+Subproject commit 48f3eb427300faf5aa0a5ba22b20997324df3d2d
diff --git a/superset/superset_config_docker.py b/superset/superset_config_docker.py
index 9602537d..3b4d2d77 100644
--- a/superset/superset_config_docker.py
+++ b/superset/superset_config_docker.py
@@ -1,3 +1,28 @@
+from datetime import timedelta
+import os
+
 FEATURE_FLAGS = {
-    "DASHBOARD_NATIVE_FILTERS": True,
+    "DASHBOARD_NATIVE_FILTERS": False,
+    "DASHBOARD_RBAC": True,
+    "GENERIC_CHART_AXES": True,
+}
+
+SECRET_KEY = os.environ["SECRET_KEY"]
+
+CACHE_CONFIG = {
+    "CACHE_TYPE": "RedisCache",
+}
+
+FILTER_STATE_CACHE_CONFIG = {
+    "CACHE_TYPE": "RedisCache",
+    "CACHE_DEFAULT_TIMEOUT": int(timedelta(days=90).total_seconds()),
+    # should the timeout be reset when retrieving a cached value
+    "REFRESH_TIMEOUT_ON_RETRIEVAL": True,
+}
+
+EXPLORE_FORM_DATA_CACHE_CONFIG = {
+    "CACHE_TYPE": "RedisCache",
+    "CACHE_DEFAULT_TIMEOUT": int(timedelta(days=7).total_seconds()),
+    # should the timeout be reset when retrieving a cached value
+    "REFRESH_TIMEOUT_ON_RETRIEVAL": True,
 }
diff --git a/tox.ini b/tox.ini
index d475c5f3..27471896 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,8 @@ commands = isort --check-only --diff dashboard_viewer
 deps =
     -r{toxinidir}/requirements-dev/requirements-prospector.txt
     -r{toxinidir}/dashboard_viewer/requirements.txt
+setenv =
+    DJANGO_SETTINGS_MODULE=dashboard_viewer.settings
 commands =
     prospector dashboard_viewer