diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_ccdd7d.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_ccdd7d.yaml
index 462debf6e..82a7de2c5 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_ccdd7d.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_ccdd7d.yaml
@@ -50,7 +50,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 651
+    id: 50
     type: table
   force: false
   form_data:
@@ -61,6 +61,7 @@ query_context:
       operator: TEMPORAL_RANGE
       subject: emission_time
     all_columns: []
+    annotation_layers: []
     color_pn: false
     column_config:
       Current Enrollees:
@@ -74,9 +75,7 @@ query_context:
       tag_list:
         truncateLongCells: true
     conditional_formatting: []
-    dashboards:
-    - 355
-    datasource: 651__table
+    datasource: 50__table
     extra_form_data: {}
     force: false
     groupby:
@@ -87,9 +86,9 @@ query_context:
       sqlExpression: |
         {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_run', 'w863AfFgi') }}{% endraw %}
     metrics:
+    - enrollees
     - active_count
     - tag_list
-    - enrollees
     order_by_cols: []
     order_desc: false
     percent_metrics: []
@@ -98,7 +97,7 @@ query_context:
     result_type: full
     row_limit: 50000
     show_cell_bars: false
-    slice_id: 1286
+    slice_id: 125
     table_timestamp_format: smart_date
     temporal_columns_lookup: {}
     time_grain_sqla: P1M
@@ -124,12 +123,12 @@ query_context:
       op: TEMPORAL_RANGE
       val: No filter
     metrics:
+    - enrollees
     - active_count
     - tag_list
-    - enrollees
     order_desc: false
     orderby:
-    - - active_count
+    - - enrollees
       - false
     post_processing: []
     row_limit: 50000
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_f909e0.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_f909e0.yaml
new file mode 100644
index 000000000..c550ef26a
--- /dev/null
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_f909e0.yaml
@@ -0,0 +1,269 @@
+_file_name: Course_Information_f909e0.yaml
+cache_timeout: null
+certification_details: null
+certified_by: null
+dataset_uuid: f25fdc4e-ce79-4f4c-9fc6-3dfe91690493
+description: null
+params:
+  adhoc_filters:
+  - clause: WHERE
+    comparator: No filter
+    expressionType: SIMPLE
+    operator: TEMPORAL_RANGE
+    subject: enrolled_at
+  all_columns: []
+  color_pn: true
+  column_config:
+    Avg Course Grade:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+    Median Course Grade:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+  conditional_formatting:
+  - colorScheme: '#EFA1AA'
+    column: avg_course_grade
+    operator: <
+    targetValue: 50
+  - colorScheme: '#ACE1C4'
+    column: avg_course_grade
+    operator: "\u2265"
+    targetValue: 70
+  - colorScheme: '#ACE1C4'
+    column: median_course_grade
+    operator: "\u2265"
+    targetValue: 70
+  - colorScheme: '#FDE380'
+    column: median_course_grade
+    operator: "\u2264 x \u2264"
+    targetValueLeft: '50'
+    targetValueRight: '70'
+  - colorScheme: '#EFA1AA'
+    column: median_course_grade
+    operator: <
+    targetValue: 50
+  - colorScheme: '#ACE1C4'
+    column: Active Within Last 7 Days
+    operator: '>'
+    targetValue: 0
+  extra_form_data: {}
+  groupby:
+  - org
+  - course_key
+  - course_name
+  - course_run
+  metrics:
+  - aggregate: AVG
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: active_within_last_7_days
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 683
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: UInt64
+      type_generic: 0
+      verbose_name: Active Within Last 7 Days
+      warning_markdown: null
+    datasourceWarning: false
+    expressionType: SIMPLE
+    hasCustomLabel: true
+    label: Active Within Last 7 Days
+    optionName: metric_9ysvoht7z9_7zzqrfsnybt
+    sqlExpression: null
+  - avg_course_grade
+  - median_course_grade
+  order_by_cols: []
+  order_desc: true
+  percent_metrics: []
+  query_mode: aggregate
+  row_limit: 1000
+  show_cell_bars: true
+  table_timestamp_format: smart_date
+  temporal_columns_lookup:
+    enrolled_at: true
+  viz_type: table
+query_context:
+  datasource:
+    id: 60
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      expressionType: SIMPLE
+      operator: TEMPORAL_RANGE
+      subject: enrolled_at
+    all_columns: []
+    color_pn: true
+    column_config:
+      Avg Course Grade:
+        d3NumberFormat: ~g
+        d3SmallNumberFormat: ~g
+      Median Course Grade:
+        d3NumberFormat: ~g
+        d3SmallNumberFormat: ~g
+    conditional_formatting:
+    - colorScheme: '#EFA1AA'
+      column: avg_course_grade
+      operator: <
+      targetValue: 50
+    - colorScheme: '#ACE1C4'
+      column: avg_course_grade
+      operator: "\u2265"
+      targetValue: 70
+    - colorScheme: '#ACE1C4'
+      column: median_course_grade
+      operator: "\u2265"
+      targetValue: 70
+    - colorScheme: '#FDE380'
+      column: median_course_grade
+      operator: "\u2264 x \u2264"
+      targetValueLeft: '50'
+      targetValueRight: '70'
+    - colorScheme: '#EFA1AA'
+      column: median_course_grade
+      operator: <
+      targetValue: 50
+    - colorScheme: '#ACE1C4'
+      column: Active Within Last 7 Days
+      operator: '>'
+      targetValue: 0
+    dashboards:
+    - 24
+    datasource: 60__table
+    extra_form_data: {}
+    force: false
+    groupby:
+    - org
+    - course_key
+    - course_name
+    - course_run
+    metrics:
+    - aggregate: AVG
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: active_within_last_7_days
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 683
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: UInt64
+        type_generic: 0
+        verbose_name: Active Within Last 7 Days
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Active Within Last 7 Days
+      optionName: metric_9ysvoht7z9_7zzqrfsnybt
+      sqlExpression: null
+    - avg_course_grade
+    - median_course_grade
+    order_by_cols: []
+    order_desc: true
+    percent_metrics: []
+    query_mode: aggregate
+    result_format: json
+    result_type: full
+    row_limit: 1000
+    show_cell_bars: true
+    slice_id: 119
+    table_timestamp_format: smart_date
+    temporal_columns_lookup:
+      enrolled_at: true
+    viz_type: table
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - org
+    - course_key
+    - course_name
+    - course_run
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      where: ''
+    filters:
+    - col: enrolled_at
+      op: TEMPORAL_RANGE
+      val: No filter
+    metrics:
+    - aggregate: AVG
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: active_within_last_7_days
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 683
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: UInt64
+        type_generic: 0
+        verbose_name: Active Within Last 7 Days
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Active Within Last 7 Days
+      optionName: metric_9ysvoht7z9_7zzqrfsnybt
+      sqlExpression: null
+    - avg_course_grade
+    - median_course_grade
+    order_desc: true
+    orderby:
+    - - aggregate: AVG
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: active_within_last_7_days
+          description: null
+          expression: null
+          filterable: true
+          groupby: true
+          id: 683
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: UInt64
+          type_generic: 0
+          verbose_name: Active Within Last 7 Days
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: true
+        label: Active Within Last 7 Days
+        optionName: metric_9ysvoht7z9_7zzqrfsnybt
+        sqlExpression: null
+      - false
+    post_processing: []
+    row_limit: 1000
+    series_limit: 0
+    url_params: {}
+  result_format: json
+  result_type: full
+slice_name: Course Information
+uuid: f909e03a-06a9-4d04-9ea0-243a576093d4
+version: 1.0.0
+viz_type: table
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Distribution_of_Course_Grades_cd3479.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Distribution_of_Course_Grades_cd3479.yaml
index e145e51f4..88b70160d 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Distribution_of_Course_Grades_cd3479.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Distribution_of_Course_Grades_cd3479.yaml
@@ -69,7 +69,7 @@ params:
   y_axis_title_position: Left
 query_context:
   datasource:
-    id: 94
+    id: 33
     type: table
   force: false
   form_data:
@@ -77,7 +77,7 @@ query_context:
     annotation_layers: []
     color_scheme: supersetColors
     comparison_type: values
-    datasource: 94__table
+    datasource: 33__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -119,7 +119,7 @@ query_context:
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    slice_id: 163
+    slice_id: 57
     sort_series_type: sum
     time_grain_sqla: P1D
     tooltipTimeFormat: smart_date
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollees_by_Enrollment_Track_f8beeb.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollees_by_Enrollment_Track_f8beeb.yaml
index 23883a99c..db60389e9 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollees_by_Enrollment_Track_f8beeb.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollees_by_Enrollment_Track_f8beeb.yaml
@@ -67,7 +67,7 @@ params:
   y_axis_title_position: Left
 query_context:
   datasource:
-    id: 94
+    id: 33
     type: table
   force: false
   form_data:
@@ -75,9 +75,7 @@ query_context:
     annotation_layers: []
     color_scheme: supersetColors
     comparison_type: values
-    dashboards:
-    - 30
-    datasource: 94__table
+    datasource: 33__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -119,7 +117,7 @@ query_context:
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    slice_id: 183
+    slice_id: 142
     sort_series_type: sum
     time_grain_sqla: P1D
     tooltipTimeFormat: smart_date
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Dates_ded618.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Dates_ded618.yaml
index d97ef9ba6..2296dc0d4 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Dates_ded618.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Dates_ded618.yaml
@@ -73,7 +73,7 @@ params:
   y_axis_title_position: Left
 query_context:
   datasource:
-    id: 254
+    id: 33
     type: table
   force: false
   form_data:
@@ -91,9 +91,7 @@ query_context:
     annotation_layers: []
     color_scheme: supersetColors
     comparison_type: values
-    dashboards:
-    - 315
-    datasource: 254__table
+    datasource: 33__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -134,7 +132,7 @@ query_context:
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    slice_id: 713
+    slice_id: 89
     sort_series_type: sum
     time_grain_sqla: P1M
     tooltipTimeFormat: smart_date
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Last_Visit_Date_6c2b10.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Last_Visit_Date_6c2b10.yaml
index cfe5a9a0a..8b71fe3e3 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Last_Visit_Date_6c2b10.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Last_Visit_Date_6c2b10.yaml
@@ -62,7 +62,7 @@ params:
   y_axis_title_position: Left
 query_context:
   datasource:
-    id: 254
+    id: 33
     type: table
   force: false
   form_data:
@@ -75,9 +75,7 @@ query_context:
     annotation_layers: []
     color_scheme: supersetColors
     comparison_type: values
-    dashboards:
-    - 315
-    datasource: 254__table
+    datasource: 33__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -117,7 +115,7 @@ query_context:
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    slice_id: 173
+    slice_id: 17
     sort_series_type: sum
     time_grain_sqla: P1M
     tooltipTimeFormat: smart_date
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Summary_6da509.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Summary_6da509.yaml
index 023060278..2d391feb6 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Summary_6da509.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Summary_6da509.yaml
@@ -83,7 +83,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 12
+    id: 29
     type: table
   force: false
   form_data:
@@ -94,6 +94,7 @@ query_context:
       operator: TEMPORAL_RANGE
       subject: emission_time
     all_columns: []
+    annotation_layers: []
     color_pn: true
     column_config:
       Course Grade %:
@@ -113,9 +114,7 @@ query_context:
       column: course_grade
       operator: <
       targetValue: 0.5
-    dashboards:
-    - 18
-    datasource: 12__table
+    datasource: 29__table
     extra_form_data: {}
     force: false
     groupby:
@@ -162,7 +161,7 @@ query_context:
     server_pagination: true
     show_cell_bars: true
     show_totals: true
-    slice_id: 32
+    slice_id: 67
     table_timestamp_format: smart_date
     temporal_columns_lookup:
       emission_time: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Number_of_Views_across_Video_Duration_a7947b.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Number_of_Views_across_Video_Duration_a7947b.yaml
index fb7d96652..353370900 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Number_of_Views_across_Video_Duration_a7947b.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Number_of_Views_across_Video_Duration_a7947b.yaml
@@ -54,7 +54,7 @@ params:
   y_axis_title_position: Left
 query_context:
   datasource:
-    id: 356
+    id: 44
     type: table
   force: false
   form_data:
@@ -67,9 +67,7 @@ query_context:
     annotation_layers: []
     color_scheme: supersetColors
     comparison_type: values
-    dashboards:
-    - 315
-    datasource: 356__table
+    datasource: 44__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -89,7 +87,7 @@ query_context:
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    slice_id: 556
+    slice_id: 144
     sort_series_type: sum
     tooltipTimeFormat: smart_date
     truncateXAxis: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_Engagement_per_Section_Subsection_29a5cf.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_Engagement_per_Section_Subsection_29a5cf.yaml
index c289a2e83..f001fa1c2 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_Engagement_per_Section_Subsection_29a5cf.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_Engagement_per_Section_Subsection_29a5cf.yaml
@@ -64,7 +64,7 @@ params:
   zoomable: true
 query_context:
   datasource:
-    id: 95
+    id: 49
     type: table
   force: false
   form_data:
@@ -72,9 +72,7 @@ query_context:
     annotation_layers: []
     color_scheme: supersetColors
     comparison_type: values
-    dashboards:
-    - 30
-    datasource: 95__table
+    datasource: 49__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -110,7 +108,7 @@ query_context:
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    slice_id: 133
+    slice_id: 93
     sort_series_type: sum
     time_grain_sqla: P1D
     tooltipTimeFormat: smart_date
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Partial_and_Full_Video_Views_2232c3.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Partial_and_Full_Video_Views_2232c3.yaml
index f85c02f84..b2ad27099 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Partial_and_Full_Video_Views_2232c3.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Partial_and_Full_Video_Views_2232c3.yaml
@@ -61,7 +61,7 @@ params:
   zoomable: true
 query_context:
   datasource:
-    id: 434
+    id: 55
     type: table
   force: false
   form_data:
@@ -69,9 +69,7 @@ query_context:
     annotation_layers: []
     color_scheme: supersetColors
     comparison_type: values
-    dashboards:
-    - 315
-    datasource: 434__table
+    datasource: 55__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -105,7 +103,7 @@ query_context:
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    slice_id: 672
+    slice_id: 80
     sort_series_type: sum
     tooltipTimeFormat: smart_date
     truncateXAxis: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Partial_and_Full_Video_Views_54a155.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Partial_and_Full_Video_Views_54a155.yaml
index 873d0de70..f11042915 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Partial_and_Full_Video_Views_54a155.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Partial_and_Full_Video_Views_54a155.yaml
@@ -8,6 +8,7 @@ params:
   adhoc_filters: []
   all_columns: []
   allow_render_html: true
+  annotation_layers: []
   color_pn: true
   comparison_color_scheme: Green
   comparison_type: values
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Attempts_6df964.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Attempts_6df964.yaml
index 8205f6c06..628b52bf2 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Attempts_6df964.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Attempts_6df964.yaml
@@ -18,6 +18,7 @@ params:
     subject: emission_time
   all_columns: []
   allow_render_html: true
+  annotation_layers: []
   color_pn: true
   column_config:
     correct_percent:
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Attempts_d3b9fa.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Attempts_d3b9fa.yaml
index 4e15b5b41..24cf20f94 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Attempts_d3b9fa.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Attempts_d3b9fa.yaml
@@ -18,6 +18,7 @@ params:
     subject: emission_time
   all_columns: []
   allow_render_html: true
+  annotation_layers: []
   color_pn: false
   comparison_color_scheme: Green
   comparison_type: values
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Engagement_per_Section_Subsection_501547.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Engagement_per_Section_Subsection_501547.yaml
index 04acb795f..397646356 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Engagement_per_Section_Subsection_501547.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Engagement_per_Section_Subsection_501547.yaml
@@ -64,7 +64,7 @@ params:
   zoomable: true
 query_context:
   datasource:
-    id: 102
+    id: 5
     type: table
   force: false
   form_data:
@@ -72,9 +72,7 @@ query_context:
     annotation_layers: []
     color_scheme: supersetColors
     comparison_type: values
-    dashboards:
-    - 30
-    datasource: 102__table
+    datasource: 5__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -110,7 +108,7 @@ query_context:
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    slice_id: 168
+    slice_id: 9
     sort_series_type: sum
     time_grain_sqla: P1D
     tooltipTimeFormat: smart_date
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results_003e60.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results_003e60.yaml
index a8fb18b05..42b53a18b 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results_003e60.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results_003e60.yaml
@@ -18,6 +18,7 @@ params:
     subject: emission_time
   all_columns: []
   allow_render_html: true
+  annotation_layers: []
   color_pn: false
   column_config:
     coursewide_correct_percent:
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results_3b70ae.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results_3b70ae.yaml
index 89807b4d1..48d5d5e52 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results_3b70ae.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results_3b70ae.yaml
@@ -18,6 +18,7 @@ params:
     subject: emission_time
   all_columns: []
   allow_render_html: true
+  annotation_layers: []
   color_pn: false
   column_config:
     Coursewide % Correct:
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_5b00f7.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_5b00f7.yaml
index 9ccaf808d..70b9374e3 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_5b00f7.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_5b00f7.yaml
@@ -34,7 +34,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 161
+    id: 65
     type: table
   force: false
   form_data:
@@ -48,8 +48,8 @@ query_context:
         d3NumberFormat: ',.1%'
     conditional_formatting: []
     dashboards:
-    - 441
-    datasource: 161__table
+    - 22
+    datasource: 65__table
     extra_form_data: {}
     force: false
     groupby:
@@ -68,7 +68,7 @@ query_context:
     result_type: full
     row_limit: 50000
     show_cell_bars: false
-    slice_id: 1121
+    slice_id: 82
     table_timestamp_format: smart_date
     temporal_columns_lookup: {}
     viz_type: table
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_6b7610.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_6b7610.yaml
index 61c98c9fc..2634c067b 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_6b7610.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_6b7610.yaml
@@ -34,7 +34,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 161
+    id: 65
     type: table
   force: false
   form_data:
@@ -48,8 +48,8 @@ query_context:
         d3NumberFormat: ',.1%'
     conditional_formatting: []
     dashboards:
-    - 441
-    datasource: 161__table
+    - 22
+    datasource: 65__table
     extra_form_data: {}
     force: false
     groupby:
@@ -68,7 +68,7 @@ query_context:
     result_type: full
     row_limit: 50000
     show_cell_bars: false
-    slice_id: 641
+    slice_id: 145
     table_timestamp_format: smart_date
     temporal_columns_lookup: {}
     viz_type: table
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_8266ce.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_8266ce.yaml
index af0adb18b..e50ff0987 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_8266ce.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_8266ce.yaml
@@ -13,6 +13,7 @@ params:
     subject: emission_time
   all_columns: []
   allow_render_html: true
+  annotation_layers: []
   color_pn: true
   comparison_color_scheme: Green
   comparison_type: values
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_per_Section_Subsection_5d0329.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_per_Section_Subsection_5d0329.yaml
index fd21f3cc5..1d99e72e8 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_per_Section_Subsection_5d0329.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_per_Section_Subsection_5d0329.yaml
@@ -64,7 +64,7 @@ params:
   zoomable: true
 query_context:
   datasource:
-    id: 96
+    id: 57
     type: table
   force: false
   form_data:
@@ -72,9 +72,7 @@ query_context:
     annotation_layers: []
     color_scheme: supersetColors
     comparison_type: values
-    dashboards:
-    - 30
-    datasource: 96__table
+    datasource: 57__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -110,7 +108,7 @@ query_context:
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    slice_id: 139
+    slice_id: 92
     sort_series_type: sum
     time_grain_sqla: P1D
     tooltipTimeFormat: smart_date
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/At-Risk_Learners.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/At-Risk_Learners.yaml
index ee7cfb00e..b9b1c2657 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/At-Risk_Learners.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/At-Risk_Learners.yaml
@@ -389,7 +389,7 @@ metadata:
   - '#D1C6BC'
   cross_filters_enabled: true
   expanded_slices:
-    '556': true
+    '144': true
   global_chart_configuration:
     chartsInScope:
     - 122
@@ -604,10 +604,10 @@ metadata:
     name: Date
     scope:
       excluded:
-      - 672
-      - 122
-      - 760
-      - 748
+      - 80
+      - 9
+      - 93
+      - 92
       rootPath:
       - TAB-GeKBNaKbHg
       - TAB-ez_vuoah8
@@ -642,18 +642,18 @@ metadata:
     name: Time Grain
     scope:
       excluded:
-      - 672
-      - 1126
-      - 122
-      - 1031
-      - 1180
-      - 760
-      - 1033
-      - 1100
-      - 592
-      - 605
-      - 748
-      - 556
+      - 80
+      - 134
+      - 9
+      - 120
+      - 142
+      - 93
+      - 121
+      - 129
+      - 70
+      - 72
+      - 92
+      - 144
       rootPath:
       - TAB-s_n47Pk1I
       - TAB-CRJ0LHIfEa
@@ -680,7 +680,7 @@ position:
     children: []
     id: CHART-LmLX-39lXb
     meta:
-      chartId: 672
+      chartId: 80
       height: 72
       sliceName: Partial and Full Video Views
       uuid: 2232c302-cd41-406f-a45d-0f674344166b
@@ -698,7 +698,7 @@ position:
     children: []
     id: CHART-NSSaeQX_nX
     meta:
-      chartId: 1126
+      chartId: 134
       height: 50
       sliceName: Video Engagement
       uuid: 8266ce91-d0b3-4c3b-aa3d-2be4d90e64a8
@@ -716,7 +716,7 @@ position:
     children: []
     id: CHART-explore-2108-1
     meta:
-      chartId: 122
+      chartId: 9
       height: 62
       sliceName: Problem Engagement per Section/Subsection
       uuid: 5015477d-d166-4823-868d-c7883d195bab
@@ -734,7 +734,7 @@ position:
     children: []
     id: CHART-explore-2128-1
     meta:
-      chartId: 1031
+      chartId: 120
       height: 50
       sliceName: Learners
       uuid: 447a194b-dbed-4a82-a899-2df8e01e84b1
@@ -750,7 +750,7 @@ position:
     children: []
     id: CHART-explore-2148-1
     meta:
-      chartId: 173
+      chartId: 17
       height: 50
       sliceName: Last Visit Date
       uuid: 6c2b1008-96c9-426d-b2fe-68aa1de7b10d
@@ -766,7 +766,7 @@ position:
     children: []
     id: CHART-explore-2168-1
     meta:
-      chartId: 1180
+      chartId: 142
       height: 50
       sliceName: Enrollees by Enrollment Track
       uuid: f8beeb8c-b35c-47fc-8370-96b493f9c1b8
@@ -782,7 +782,7 @@ position:
     children: []
     id: CHART-explore-2188-1
     meta:
-      chartId: 760
+      chartId: 93
       height: 63
       sliceName: Page Engagement per Section/Subsection
       uuid: 29a5cf7e-41cd-4b60-a63a-c921d6ebd997
@@ -800,7 +800,7 @@ position:
     children: []
     id: CHART-explore-2208-1
     meta:
-      chartId: 1033
+      chartId: 121
       height: 50
       sliceName: Section Summary
       uuid: eec3a432-153f-42bc-8d37-52b200a77acd
@@ -818,7 +818,7 @@ position:
     children: []
     id: CHART-explore-2209-1
     meta:
-      chartId: 408
+      chartId: 40
       height: 50
       sliceName: Cumulative Interactions
       uuid: 3a22091f-4686-4a1d-a66d-b36541844b36
@@ -836,7 +836,7 @@ position:
     children: []
     id: CHART-explore-2210-1
     meta:
-      chartId: 1100
+      chartId: 129
       height: 50
       sliceName: Subsection Summary
       uuid: f60f12f3-f4f1-41af-8b10-d2cf3cb94f69
@@ -854,7 +854,7 @@ position:
     children: []
     id: CHART-explore-2211-1
     meta:
-      chartId: 832
+      chartId: 99
       height: 50
       sliceName: Page Engagement Over Time
       uuid: ffa98e7f-7bed-4435-a1c1-472a46a4d269
@@ -872,7 +872,7 @@ position:
     children: []
     id: CHART-explore-2664-1
     meta:
-      chartId: 592
+      chartId: 70
       height: 50
       sliceName: Problem Attempts
       uuid: d3b9fa1e-f0ab-41e5-9705-27c7c58e620c
@@ -890,7 +890,7 @@ position:
     children: []
     id: CHART-explore-2665-1
     meta:
-      chartId: 605
+      chartId: 72
       height: 50
       sliceName: Problem Results
       uuid: 003e60b9-907d-4002-bf2e-7d315225ec29
@@ -908,7 +908,7 @@ position:
     children: []
     id: CHART-explore-2707-1
     meta:
-      chartId: 748
+      chartId: 92
       height: 64
       sliceName: Video Engagement per Section/Subsection
       uuid: 5d0329f4-2a4a-4cd4-8b4e-926568d1bbcc
@@ -926,7 +926,7 @@ position:
     children: []
     id: CHART-explore-2708-1
     meta:
-      chartId: 556
+      chartId: 144
       height: 50
       sliceName: Watched Video Segments
       uuid: a7947bdb-65a2-49ed-815e-850423bfeacc
@@ -944,7 +944,7 @@ position:
     children: []
     id: CHART-explore-2785-1
     meta:
-      chartId: 713
+      chartId: 89
       height: 50
       sliceName: Enrollment Dates
       uuid: ded61855-48ea-4705-9385-690bf7dba53b
@@ -960,7 +960,7 @@ position:
     children: []
     id: CHART-explore-2805-1
     meta:
-      chartId: 499
+      chartId: 57
       height: 50
       sliceName: Distribution of Course Grades
       uuid: cd3479d8-3574-4b77-9e1e-2ad176989b4d
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Comparison_Dashboard.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Comparison_Dashboard.yaml
index f9053082b..9fd139524 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Comparison_Dashboard.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Comparison_Dashboard.yaml
@@ -172,10 +172,10 @@ metadata:
   - '#D1C6BC'
   cross_filters_enabled: true
   expanded_slices:
-    '101': true
-    '1461': true
-    '461': true
-    '61': true
+    '104': true
+    '109': true
+    '56': true
+    '75': true
   global_chart_configuration:
     chartsInScope:
     - 1467
@@ -349,7 +349,7 @@ position:
     children: []
     id: CHART-explore-1467-1
     meta:
-      chartId: 1121
+      chartId: 82
       height: 50
       sliceName: Video Engagement
       uuid: 5b00f792-233c-4ee6-9411-7df49f4b5061
@@ -364,7 +364,7 @@ position:
     children: []
     id: CHART-explore-1500-1
     meta:
-      chartId: 541
+      chartId: 25
       height: 50
       sliceName: Course Info
       uuid: b2fff8a7-3ace-4075-9a3f-5fa5b99f81bb
@@ -379,7 +379,7 @@ position:
     children: []
     id: CHART-explore-1501-1
     meta:
-      chartId: 181
+      chartId: 125
       height: 50
       sliceName: Course Info
       uuid: ccdd7d98-4722-490b-a0b2-077380a7c7eb
@@ -394,7 +394,7 @@ position:
     children: []
     id: CHART-explore-1502-1
     meta:
-      chartId: 141
+      chartId: 19
       height: 50
       sliceName: Enrollment Counts
       uuid: 7eaf5bc2-0067-424b-a50b-607cf54c086a
@@ -409,7 +409,7 @@ position:
     children: []
     id: CHART-explore-1503-1
     meta:
-      chartId: 1141
+      chartId: 63
       height: 50
       sliceName: Enrollment Counts
       uuid: 8230a366-957d-4667-a2ff-3cbcb2f25f60
@@ -424,7 +424,7 @@ position:
     children: []
     id: CHART-explore-1504-1
     meta:
-      chartId: 461
+      chartId: 75
       height: 50
       sliceName: Learner Performance Breakdown
       uuid: b73b0a5c-4861-402e-a39c-d73333a4d911
@@ -439,7 +439,7 @@ position:
     children: []
     id: CHART-explore-1505-1
     meta:
-      chartId: 101
+      chartId: 104
       height: 50
       sliceName: Learner Performance Breakdown
       uuid: d414b144-467b-456b-b899-9cfb3579faba
@@ -454,7 +454,7 @@ position:
     children: []
     id: CHART-explore-1506-1
     meta:
-      chartId: 61
+      chartId: 109
       height: 50
       sliceName: Learner Performance
       uuid: b518f341-9ed4-4c23-bb88-6c1d497aa260
@@ -469,7 +469,7 @@ position:
     children: []
     id: CHART-explore-1507-1
     meta:
-      chartId: 1461
+      chartId: 56
       height: 50
       sliceName: Learner Performance
       uuid: b0e170ce-26f1-4452-a3c0-49b41fa6e529
@@ -484,7 +484,7 @@ position:
     children: []
     id: CHART-explore-1508-1
     meta:
-      chartId: 641
+      chartId: 145
       height: 50
       sliceName: Video Engagement
       uuid: 6b7610a7-41d0-4d14-be81-62a5a8f22d62
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Dashboard.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Dashboard.yaml
index 269bb2035..595befabd 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Dashboard.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Dashboard.yaml
@@ -346,8 +346,9 @@ metadata:
   - '#9EE5E5'
   - '#D1C6BC'
   cross_filters_enabled: true
+  default_filters: '{}'
   expanded_slices:
-    '501': true
+    '124': true
   global_chart_configuration:
     chartsInScope:
     - 2
@@ -561,10 +562,10 @@ metadata:
     name: Date
     scope:
       excluded:
-      - 381
-      - 1281
-      - 861
-      - 1261
+      - 123
+      - 47
+      - 22
+      - 7
       rootPath:
       - TAB-4ptSkqs5MS
       - TAB-_Ey4nPhFr
@@ -601,16 +602,16 @@ metadata:
     name: Time Grain
     scope:
       excluded:
-      - 761
-      - 501
-      - 381
-      - 1281
-      - 861
-      - 1261
-      - 901
-      - 21
-      - 1081
-      - 1241
+      - 141
+      - 124
+      - 123
+      - 47
+      - 22
+      - 7
+      - 2
+      - 91
+      - 52
+      - 35
       rootPath:
       - TAB-4ptSkqs5MS
       - TAB-_Ey4nPhFr
@@ -634,7 +635,7 @@ position:
     children: []
     id: CHART-XNUtUvjGrL
     meta:
-      chartId: 741
+      chartId: 38
       height: 50
       sliceName: Page Engagement Over Time
       uuid: d7bfef35-d35a-405f-ae59-73472845cd59
@@ -652,7 +653,7 @@ position:
     children: []
     id: CHART-explore-119-1
     meta:
-      chartId: 761
+      chartId: 141
       height: 50
       sliceName: Problem Attempts and Results
       uuid: ba14d2ea-8c53-4f79-aa1b-434011f3c725
@@ -670,7 +671,7 @@ position:
     children: []
     id: CHART-explore-121-1
     meta:
-      chartId: 501
+      chartId: 124
       height: 54
       sliceName: Number of Views across Video Duration
       uuid: 2985a9db-c338-4008-af52-2930b81ee2e5
@@ -688,7 +689,7 @@ position:
     children: []
     id: CHART-explore-122-1
     meta:
-      chartId: 381
+      chartId: 123
       height: 53
       sliceName: Partial and Full Video Views
       uuid: bfffb9fe-07bd-4b2f-b437-522d45f6cd2c
@@ -706,7 +707,7 @@ position:
     children: []
     id: CHART-explore-123-1
     meta:
-      chartId: 1281
+      chartId: 47
       height: 61
       sliceName: Page Engagement per Section/Subsection
       uuid: bf2d6219-d633-48c1-a9b5-742eac6a4c0a
@@ -724,7 +725,7 @@ position:
     children: []
     id: CHART-explore-124-1
     meta:
-      chartId: 781
+      chartId: 23
       height: 50
       sliceName: Distribution of Current Course Grade
       uuid: ea565658-6796-40e8-9d1e-01ffd0778bc9
@@ -741,7 +742,7 @@ position:
     children: []
     id: CHART-explore-125-1
     meta:
-      chartId: 861
+      chartId: 22
       height: 61
       sliceName: Problem Engagement per Section/Subsection
       uuid: 8cdcd4aa-1fa2-41dc-b38d-f1112134592e
@@ -759,7 +760,7 @@ position:
     children: []
     id: CHART-explore-126-1
     meta:
-      chartId: 1261
+      chartId: 7
       height: 69
       sliceName: Video Engagement per Section/Subsection
       uuid: c1f77432-e55f-4473-b7d0-7a1c3976e6a8
@@ -777,7 +778,7 @@ position:
     children: []
     id: CHART-explore-127-1
     meta:
-      chartId: 901
+      chartId: 2
       height: 39
       sliceName: Video Engagement
       uuid: c8c363f8-8dbc-4a78-841d-4976f4404884
@@ -795,7 +796,7 @@ position:
     children: []
     id: CHART-explore-129-1
     meta:
-      chartId: 1341
+      chartId: 132
       height: 27
       sliceName: Learners with Passing Grade
       uuid: b40cdabc-b265-48d2-913d-a9dfee0b6ab1
@@ -812,7 +813,7 @@ position:
     children: []
     id: CHART-explore-149-1
     meta:
-      chartId: 1481
+      chartId: 149
       height: 29
       sliceName: Course Information
       uuid: f909e03a-06a9-4d04-9ea0-243a576093d4
@@ -826,7 +827,7 @@ position:
     children: []
     id: CHART-explore-185-1
     meta:
-      chartId: 1021
+      chartId: 42
       height: 29
       sliceName: Current Enrollees
       uuid: 00de2f72-b3ed-4994-b231-fd3cf29d758d
@@ -840,7 +841,7 @@ position:
     children: []
     id: CHART-explore-188-1
     meta:
-      chartId: 21
+      chartId: 91
       height: 51
       sliceName: Enrollees per Enrollment Track
       uuid: e584199e-0ed6-42bf-afb9-db3b9fe4132b
@@ -856,7 +857,7 @@ position:
     children: []
     id: CHART-explore-189-1
     meta:
-      chartId: 1401
+      chartId: 41
       height: 51
       sliceName: Cumulative Enrollments by Track
       uuid: f207c896-030a-462b-b69f-6416230d50b6
@@ -873,7 +874,7 @@ position:
     children: []
     id: CHART-explore-191-1
     meta:
-      chartId: 1081
+      chartId: 52
       height: 50
       sliceName: Section Summary
       uuid: 47417136-acd1-44a1-b41e-644eb2c237c3
@@ -891,7 +892,7 @@ position:
     children: []
     id: CHART-explore-192-1
     meta:
-      chartId: 1241
+      chartId: 35
       height: 50
       sliceName: Subsection Summary
       uuid: 2a8d96be-687d-4918-98fe-ae9fbd599152
@@ -909,7 +910,7 @@ position:
     children: []
     id: CHART-explore-195-1
     meta:
-      chartId: 1
+      chartId: 94
       height: 50
       sliceName: Cumulative Interactions
       uuid: c44e43b5-ba69-4805-8d01-3b04dcbf2cb6
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Individual_Learner.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Individual_Learner.yaml
index 191356856..7589a2be8 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Individual_Learner.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Individual_Learner.yaml
@@ -317,9 +317,9 @@ metadata:
   - '#D1C6BC'
   cross_filters_enabled: true
   expanded_slices:
-    '1483': true
-    '193': true
-    '388': true
+    '112': true
+    '124': true
+    '5': true
   global_chart_configuration:
     chartsInScope:
     - 81
@@ -630,7 +630,7 @@ position:
     children: []
     id: CHART-3L0xSxskX4
     meta:
-      chartId: 217
+      chartId: 22
       height: 56
       sliceName: Problem Engagement per Section/Subsection
       uuid: 8cdcd4aa-1fa2-41dc-b38d-f1112134592e
@@ -646,7 +646,7 @@ position:
     children: []
     id: CHART-4zWYZE6VQm
     meta:
-      chartId: 451
+      chartId: 47
       height: 50
       sliceName: Page Engagement per Section/Subsection
       uuid: bf2d6219-d633-48c1-a9b5-742eac6a4c0a
@@ -662,7 +662,7 @@ position:
     children: []
     id: CHART-BmEG_m0R8l
     meta:
-      chartId: 193
+      chartId: 124
       height: 50
       sliceName: Watched Video Segments
       uuid: 2985a9db-c338-4008-af52-2930b81ee2e5
@@ -678,7 +678,7 @@ position:
     children: []
     id: CHART-OJrXW113HX
     meta:
-      chartId: 388
+      chartId: 5
       height: 50
       sliceName: Problem Attempts
       uuid: 6df96404-8c09-4a52-96c8-9a60a92cec29
@@ -694,7 +694,7 @@ position:
     children: []
     id: CHART-explore-191-1
     meta:
-      chartId: 146
+      chartId: 12
       height: 50
       sliceName: Page Engagement per Subsection
       uuid: 18f85781-d604-4edf-a3e6-429e16c3040a
@@ -710,7 +710,7 @@ position:
     children: []
     id: CHART-explore-192-1
     meta:
-      chartId: 606
+      chartId: 73
       height: 50
       sliceName: Page Engagement per Section
       uuid: 834ec7c4-ead8-4dea-b227-1c8be5fbb1d3
@@ -726,7 +726,7 @@ position:
     children: []
     id: CHART-explore-194-1
     meta:
-      chartId: 799
+      chartId: 96
       height: 50
       sliceName: Problem Engagement per Section
       uuid: 1d00bbc3-f0d5-4c17-b9f3-8cc4d5516950
@@ -742,7 +742,7 @@ position:
     children: []
     id: CHART-explore-195-1
     meta:
-      chartId: 157
+      chartId: 15
       height: 50
       sliceName: Problem Engagement per Subsection
       uuid: b3516698-35fe-4934-862a-7f5fb869d322
@@ -758,7 +758,7 @@ position:
     children: []
     id: CHART-explore-196-1
     meta:
-      chartId: 1166
+      chartId: 140
       height: 50
       sliceName: Video Engagement per Section
       uuid: 0744f1bf-1636-4735-861b-18a6f1e825a2
@@ -774,7 +774,7 @@ position:
     children: []
     id: CHART-explore-197-1
     meta:
-      chartId: 1132
+      chartId: 135
       height: 50
       sliceName: Video Engagement per Subsection
       uuid: cf5b6eb7-d22c-4dda-bd4e-ee2401f337cc
@@ -790,7 +790,7 @@ position:
     children: []
     id: CHART-explore-198-1
     meta:
-      chartId: 256
+      chartId: 28
       height: 50
       sliceName: Partial and Full Video Views
       uuid: 54a1551c-7eb3-43fb-abd1-005816da0769
@@ -806,7 +806,7 @@ position:
     children: []
     id: CHART-explore-64-1
     meta:
-      chartId: 1483
+      chartId: 112
       height: 50
       sliceName: Problem Results
       uuid: 3b70aeac-54d3-4aad-86ff-296d2947a7bd
@@ -820,7 +820,7 @@ position:
     children: []
     id: CHART-hZ8cIzkMoC
     meta:
-      chartId: 1039
+      chartId: 123
       height: 50
       sliceName: Partial and Full Video Views
       uuid: bfffb9fe-07bd-4b2f-b437-522d45f6cd2c
@@ -836,7 +836,7 @@ position:
     children: []
     id: CHART-nw620qu42a
     meta:
-      chartId: 1530
+      chartId: 67
       height: 50
       sliceName: Learner Summary
       uuid: 6da50964-000e-4342-a931-3881feb02c13
@@ -850,7 +850,7 @@ position:
     children: []
     id: CHART-ykpHXAV6JN
     meta:
-      chartId: 81
+      chartId: 7
       height: 50
       sliceName: Video Engagement per Section/Subsection
       uuid: c1f77432-e55f-4473-b7d0-7a1c3976e6a8
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_student_status_plus_7_days.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_student_status_plus_7_days.yaml
index 73988615d..23590196a 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_student_status_plus_7_days.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_student_status_plus_7_days.yaml
@@ -6,7 +6,8 @@ columns:
   column_name: active_within_last_7_days
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -18,7 +19,8 @@ columns:
   column_name: course_key
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -30,7 +32,8 @@ columns:
   column_name: enrollment_mode
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -42,7 +45,8 @@ columns:
   column_name: course_grade
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -54,7 +58,8 @@ columns:
   column_name: enrolled_at
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -66,7 +71,8 @@ columns:
   column_name: actor_id
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -78,7 +84,8 @@ columns:
   column_name: approving_state
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -90,7 +97,8 @@ columns:
   column_name: grade_bucket
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -102,7 +110,8 @@ columns:
   column_name: course_name
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -114,7 +123,8 @@ columns:
   column_name: course_run
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -126,7 +136,8 @@ columns:
   column_name: enrollment_status
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -138,7 +149,8 @@ columns:
   column_name: org
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -150,7 +162,8 @@ columns:
   column_name: email
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -162,7 +175,8 @@ columns:
   column_name: name
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -174,7 +188,8 @@ columns:
   column_name: username
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -214,8 +229,7 @@ metrics:
   d3format: null
   description: null
   expression: AVG(active_within_last_7_days)
-  extra:
-    warning_markdown: ''
+  extra: {}
   metric_name: active_within_7_days
   metric_type: null
   verbose_name: Active Within Last 7 Days
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/watched_video_duration.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/watched_video_duration.yaml
index d96d8289f..611b47280 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/watched_video_duration.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/watched_video_duration.yaml
@@ -157,6 +157,16 @@ metrics:
   metric_type: null
   verbose_name: Avg Video Length (seconds)
   warning_text: null
+- currency: null
+  d3format: null
+  description: null
+  expression: avg(video_count)
+  extra:
+    warning_markdown: ''
+  metric_name: num_videos
+  metric_type: null
+  verbose_name: Number of Videos
+  warning_text: null
 - currency: null
   d3format: null
   description: null