diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 7a6d7481d..986464ee3 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 0.3.1
+current_version = 0.3.2
commit = False
tag = False
diff --git a/docs/api/covidcast-signals/indicator-combination-inactive.md b/docs/api/covidcast-signals/indicator-combination-inactive.md
index 65828361f..c01644ba1 100644
--- a/docs/api/covidcast-signals/indicator-combination-inactive.md
+++ b/docs/api/covidcast-signals/indicator-combination-inactive.md
@@ -200,3 +200,30 @@ The resampling method for each input source is as follows:
the reported proportion and sample size.
* *Google Health Trends:* Because we do not have access to the sampling
distribution, we do not resample this signal.
+
+## Compositional Signals: Confirmed Cases and Deaths
+
+* **Earliest issue available:** 7 July 2020
+* **Number of data revisions since 19 May 2020:** 1
+* **Date of last change:** [12 October 2020](../covidcast_changelog.md#indicator-combination)
+* **Available for:** county, msa, hrr, state (see [geography coding docs](../covidcast_geography.md))
+* **Time type:** day (see [date format docs](../covidcast_times.md))
+
+These signals combine the cases and deaths data from JHU and USA Facts. This is
+a straight composition: the signals below use the [JHU signal data](jhu-csse.md)
+for Puerto Rico, and the [USA Facts signal data](usa-facts.md) everywhere else.
+Consult each signal's documentation for information about geographic reporting,
+backfill, and other limitations.
+
+These signals were updated daily until November 18, 2021.
+
+| Signal | 7-day average signal | Description |
+| --- | --- | --- |
+| `confirmed_cumulative_num` | | Cumulative number of confirmed COVID-19 cases
**Earliest date available:** 2020-02-20 |
+| `confirmed_cumulative_prop` | | Cumulative number of confirmed COVID-19 cases per 100,000 population
**Earliest date available:** 2020-02-20 |
+| `confirmed_incidence_num` | `confirmed_7dav_incidence_num` | Number of new confirmed COVID-19 cases, daily
**Earliest date available:** 2020-02-20 |
+| `confirmed_incidence_prop` | `confirmed_7dav_incidence_prop` | Number of new confirmed COVID-19 cases per 100,000 population, daily
**Earliest date available:** 2020-02-20 |
+| `deaths_cumulative_num` | | Cumulative number of confirmed deaths due to COVID-19
**Earliest date available:** 2020-02-20 |
+| `deaths_cumulative_prop` | | Cumulative number of confirmed due to COVID-19, per 100,000 population
**Earliest date available:** 2020-02-20 |
+| `deaths_incidence_num` | `deaths_7dav_incidence_num` | Number of new confirmed deaths due to COVID-19, daily
**Earliest date available:** 2020-02-20 |
+| `deaths_incidence_prop` | `deaths_7dav_incidence_prop` | Number of new confirmed deaths due to COVID-19 per 100,000 population, daily
**Earliest date available:** 2020-02-20 |
diff --git a/docs/api/covidcast-signals/indicator-combination.md b/docs/api/covidcast-signals/indicator-combination.md
deleted file mode 100644
index 993bfe3f2..000000000
--- a/docs/api/covidcast-signals/indicator-combination.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-title: Indicator Combination
-parent: Data Sources and Signals
-grand_parent: COVIDcast Epidata API
----
-
-# Indicator Combination
-{: .no_toc}
-
-* **Source name:** `indicator-combination`
-
-This source provides signals which are combinations of the other sources,
-calculated or composed by Delphi. It is not a primary data source.
-
-## Table of contents
-{: .no_toc .text-delta}
-
-1. TOC
-{:toc}
-
-## Statistical Combination Signals (Inactive)
-
-The NMF combination signals were deactivated on March 17, 2021. Documentation for
-these signals is still available on the page for
-[inactive indicator-combination signals](indicator-combination-inactive.md).
-
-## Compositional Signals: Confirmed Cases and Deaths
-
-* **Earliest issue available:** 7 July 2020
-* **Number of data revisions since 19 May 2020:** 1
-* **Date of last change:** [12 October 2020](../covidcast_changelog.md#indicator-combination)
-* **Available for:** county, msa, hrr, state (see [geography coding docs](../covidcast_geography.md))
-* **Time type:** day (see [date format docs](../covidcast_times.md))
-
-These signals combine the cases and deaths data from JHU and USA Facts. This is
-a straight composition: the signals below use the [JHU signal data](jhu-csse.md)
-for Puerto Rico, and the [USA Facts signal data](usa-facts.md) everywhere else.
-Consult each signal's documentation for information about geographic reporting,
-backfill, and other limitations.
-
-| Signal | 7-day average signal | Description |
-| --- | --- | --- |
-| `confirmed_cumulative_num` | | Cumulative number of confirmed COVID-19 cases
**Earliest date available:** 2020-02-20 |
-| `confirmed_cumulative_prop` | | Cumulative number of confirmed COVID-19 cases per 100,000 population
**Earliest date available:** 2020-02-20 |
-| `confirmed_incidence_num` | `confirmed_7dav_incidence_num` | Number of new confirmed COVID-19 cases, daily
**Earliest date available:** 2020-02-20 |
-| `confirmed_incidence_prop` | `confirmed_7dav_incidence_prop` | Number of new confirmed COVID-19 cases per 100,000 population, daily
**Earliest date available:** 2020-02-20 |
-| `deaths_cumulative_num` | | Cumulative number of confirmed deaths due to COVID-19
**Earliest date available:** 2020-02-20 |
-| `deaths_cumulative_prop` | | Cumulative number of confirmed due to COVID-19, per 100,000 population
**Earliest date available:** 2020-02-20 |
-| `deaths_incidence_num` | `deaths_7dav_incidence_num` | Number of new confirmed deaths due to COVID-19, daily
**Earliest date available:** 2020-02-20 |
-| `deaths_incidence_prop` | `deaths_7dav_incidence_prop` | Number of new confirmed deaths due to COVID-19 per 100,000 population, daily
**Earliest date available:** 2020-02-20 |
diff --git a/docs/api/covidcast-signals/nchs-mortality.md b/docs/api/covidcast-signals/nchs-mortality.md
index 3703879d3..acecececf 100644
--- a/docs/api/covidcast-signals/nchs-mortality.md
+++ b/docs/api/covidcast-signals/nchs-mortality.md
@@ -88,12 +88,13 @@ There is a lag in time between when the death occurred and when the death
certificate is completed, submitted to NCHS, and processed for reporting
purposes. The death counts for recent weeks are continually revised and may
increase or decrease as new and updated death certificate data are received from
-the states by NCHS. This delay can range from 1 to 8 weeks or even more.
-Some states report deaths on a daily basis, while other states report deaths weekly
-or monthly. State vital record reporting may also be affected or delayed by
-COVID-19 related response activities which make death counts not comparable
-across states. We check for updates reported by NCHS every weekday but will
-report the signals weekly (on Monday).
+the states by NCHS. This delay can range from 1 to 8 weeks or even more; review
+[this detailed analysis of reporting delays](https://doi.org/10.1057/s41271-021-00309-7)
+for more information. Some states report deaths on a daily basis, while other
+states report deaths weekly or monthly. State vital record reporting may also be
+affected or delayed by COVID-19 related response activities which make death
+counts not comparable across states. We check for updates reported by NCHS every
+weekday but will report the signals weekly (on Monday).
## Source and Licensing
diff --git a/docs/api/covidcast_licensing.md b/docs/api/covidcast_licensing.md
index 90c60a5ce..7b73775df 100644
--- a/docs/api/covidcast_licensing.md
+++ b/docs/api/covidcast_licensing.md
@@ -29,7 +29,7 @@ Attribution license](https://creativecommons.org/licenses/by/4.0/):
* [Doctor Visits](covidcast-signals/doctor-visits.md)
* [Hospital Admissions](covidcast-signals/hospital-admissions.md)
-* [Indicator Combination](covidcast-signals/indicator-combination.md): signals
+* [Indicator Combination](covidcast-signals/indicator-combination-inactive.md): signals
with names beginning `nmf_*`
* [Quidel](covidcast-signals/quidel.md)
* [Symptom Surveys](covidcast-signals/fb-survey.md)
@@ -54,7 +54,7 @@ These data streams are essentially mirrors of their respective sources, and are
published here subject to the original license provided by the source:
* [Google Health Trends](covidcast-signals/ght.md)
-* [Indicator Combination](covidcast-signals/indicator-combination.md): cases and
+* [Indicator Combination](covidcast-signals/indicator-combination-inactive.md): cases and
deaths signals
* [JHU Cases and Deaths](covidcast-signals/jhu-csse.md)
* [SafeGraph Mobility](covidcast-signals/safegraph.md)
diff --git a/docs/api/covidcast_signals.md b/docs/api/covidcast_signals.md
index 816812173..72fd7dee3 100644
--- a/docs/api/covidcast_signals.md
+++ b/docs/api/covidcast_signals.md
@@ -43,10 +43,10 @@ tool](https://delphi.cmu.edu/covidcast/export/):
| Early Indicators | COVID-Like Symptoms in Community | [`fb-survey`](covidcast-signals/fb-survey.md) | `smoothed_hh_cmnty_cli` |
| Late Indicators | COVID Antigen Test Positivity (Quidel) | [`quidel`](covidcast-signals/quidel.md) | `covid_ag_smoothed_pct_positive` |
| Late Indicators | Claims-Based COVID Hospital Admissions | [`hospital-admissions`](covidcast-signals/hospital-admissions.md) | `smoothed_adj_covid19_from_claims` |
-| Late Indicators | Cases | [`indicator-combination`](covidcast-signals/indicator-combination.md) | `confirmed_7dav_incidence_num` |
-| Late Indicators | Cases per 100,000 People | [`indicator-combination`](covidcast-signals/indicator-combination.md) | `confirmed_7dav_incidence_prop` |
-| Late Indicators | Deaths | [`indicator-combination`](covidcast-signals/indicator-combination.md) | `deaths_7dav_incidence_num` |
-| Late Indicators | Deaths per 100,000 People | [`indicator-combination`](covidcast-signals/indicator-combination.md) | `deaths_7dav_incidence_prop` |
+| Late Indicators | Cases | [`jhu-csse`](covidcast-signals/jhu-csse.md) | `confirmed_7dav_incidence_num` |
+| Late Indicators | Cases per 100,000 People | [`jhu-csse`](covidcast-signals/jhu-csse.md) | `confirmed_7dav_incidence_prop` |
+| Late Indicators | Deaths | [`jhu-csse`](covidcast-signals/jhu-csse.md) | `deaths_7dav_incidence_num` |
+| Late Indicators | Deaths per 100,000 People | [`jhu-csse`](covidcast-signals/jhu-csse.md) | `deaths_7dav_incidence_prop` |
## All Available Sources and Signals
diff --git a/src/client/delphi_epidata.R b/src/client/delphi_epidata.R
index 645a90d16..c5fdf8b3c 100644
--- a/src/client/delphi_epidata.R
+++ b/src/client/delphi_epidata.R
@@ -15,7 +15,7 @@ Epidata <- (function() {
# API base url
BASE_URL <- 'https://delphi.cmu.edu/epidata/api.php'
- client_version <- '0.3.1'
+ client_version <- '0.3.2'
# Helper function to cast values and/or ranges to strings
.listitem <- function(value) {
diff --git a/src/client/delphi_epidata.js b/src/client/delphi_epidata.js
index 927633680..a74f9a056 100644
--- a/src/client/delphi_epidata.js
+++ b/src/client/delphi_epidata.js
@@ -22,7 +22,7 @@
}
})(this, function (exports, fetchImpl, jQuery) {
const BASE_URL = "https://delphi.cmu.edu/epidata/";
- const client_version = "0.3.1";
+ const client_version = "0.3.2";
// Helper function to cast values and/or ranges to strings
function _listitem(value) {
diff --git a/src/client/packaging/npm/package.json b/src/client/packaging/npm/package.json
index 4e432350c..bbccc7b12 100644
--- a/src/client/packaging/npm/package.json
+++ b/src/client/packaging/npm/package.json
@@ -2,7 +2,7 @@
"name": "delphi_epidata",
"description": "Delphi Epidata API Client",
"authors": "Delphi Group",
- "version": "0.3.1",
+ "version": "0.3.2",
"license": "MIT",
"homepage": "https://github.com/cmu-delphi/delphi-epidata",
"bugs": {
diff --git a/src/client/packaging/pypi/delphi_epidata/__init__.py b/src/client/packaging/pypi/delphi_epidata/__init__.py
index 5547d8000..6f363831c 100644
--- a/src/client/packaging/pypi/delphi_epidata/__init__.py
+++ b/src/client/packaging/pypi/delphi_epidata/__init__.py
@@ -1,4 +1,4 @@
from .delphi_epidata import Epidata
name = 'delphi_epidata'
-__version__ = '0.3.1'
+__version__ = '0.3.2'
diff --git a/src/client/packaging/pypi/setup.py b/src/client/packaging/pypi/setup.py
index b57fd09cf..7f6e571d4 100644
--- a/src/client/packaging/pypi/setup.py
+++ b/src/client/packaging/pypi/setup.py
@@ -5,7 +5,7 @@
setuptools.setup(
name="delphi_epidata",
- version="0.3.1",
+ version="0.3.2",
author="David Farrow",
author_email="dfarrow0@gmail.com",
description="A programmatic interface to Delphi's Epidata API.",
diff --git a/src/server/_config.py b/src/server/_config.py
index ab53fe1db..f2bf2720f 100644
--- a/src/server/_config.py
+++ b/src/server/_config.py
@@ -5,7 +5,7 @@
load_dotenv()
-VERSION = "0.3.1"
+VERSION = "0.3.2"
MAX_RESULTS = int(10e6)
MAX_COMPATIBILITY_RESULTS = int(3650)
diff --git a/src/server/_printer.py b/src/server/_printer.py
index 06f92b420..715214e19 100644
--- a/src/server/_printer.py
+++ b/src/server/_printer.py
@@ -18,8 +18,16 @@ def print_non_standard(data):
format = request.values.get("format", "classic")
if format == "json":
return jsonify(data)
+
+ if not data:
+ message = "no results"
+ result = -2
else:
- return jsonify(dict(result=1, message="success", epidata=data))
+ message = "success"
+ result = 1
+ if result == -1 and is_compatibility_mode():
+ return jsonify(dict(result=result, message=message))
+ return jsonify(dict(result=result, message=message, epidata=data))
class APrinter:
diff --git a/src/server/endpoints/covidcast_utils/db_signals.csv b/src/server/endpoints/covidcast_utils/db_signals.csv
index 5c4e771db..2d3c6f703 100644
--- a/src/server/endpoints/covidcast_utils/db_signals.csv
+++ b/src/server/endpoints/covidcast_utils/db_signals.csv
@@ -3,24 +3,24 @@ chng-cli,smoothed_outpatient_cli,FALSE,smoothed_outpatient_cli,FALSE,COVID-Relat
chng-cli,smoothed_outpatient_cli,TRUE,smoothed_adj_outpatient_cli,FALSE,{base_name} (Day-adjusted),TRUE,,"{base_description}, and adjusted to reduce day-of-week effects",day,Date,Value,raw,early,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
chng-covid,smoothed_outpatient_covid,FALSE,smoothed_outpatient_covid,FALSE,COVID-Confirmed Doctor Visits,TRUE,COVID-Confirmed Doctor Visits,"Estimated percentage of outpatient doctor visits with confirmed COVID-19, based on Change Healthcare claims data that has been de-identified in accordance with HIPAA privacy regulations, smoothed in time using a Gaussian linear smoother ",day,Date,Value,raw,early,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
chng-covid,smoothed_outpatient_covid,TRUE,smoothed_adj_outpatient_covid,FALSE,{base_name} (Day-adjusted),TRUE,,"{base_description}, and adjusted to reduce day-of-week effects",day,Date,Value,raw,early,bad,TRUE,FALSE,FALSE,FALSE,TRUE,
-covid-act-now,pcr_specimen_positivity_rate,FALSE,pcr_specimen_positivity_rate,FALSE,PCR Test Positivity Rate,TRUE,Proportion of PCR specimens tested that have a positive result,,day,Date,Value,fraction,other,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
-covid-act-now,pcr_specimen_total_tests,FALSE,pcr_specimen_total_tests,FALSE,Total Number of PCR Tests,TRUE,Total number of PCR specimens tested,,day,Date,Value,count,other,good,FALSE,FALSE,FALSE,FALSE,FALSE,
+covid-act-now,pcr_specimen_positivity_rate,FALSE,pcr_specimen_positivity_rate,FALSE,PCR Test Positivity Rate,TRUE,Proportion of PCR specimens tested that have a positive result,,day,Date,Value,fraction,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+covid-act-now,pcr_specimen_total_tests,FALSE,pcr_specimen_total_tests,FALSE,Total Number of PCR Tests,TRUE,Total number of PCR specimens tested,,day,Date,Value,count,late,good,FALSE,FALSE,FALSE,FALSE,FALSE,
doctor-visits,smoothed_cli,FALSE,smoothed_cli,FALSE,COVID-Related Doctor Visits,TRUE,Percentage of daily doctor visits that are due to COVID-like symptoms,"Estimated percentage of outpatient doctor visits that are primarily about COVID-related symptoms, based on data from health system partners, smoothed in time using a Gaussian linear smoother",day,Date,Percentage,percent,early,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
doctor-visits,smoothed_cli,TRUE,smoothed_adj_cli,FALSE,{base_name} (Day-adjusted),TRUE,,"{base_description}, and adjusted to reduce day-of-week effects",day,Date,Percentage,percent,early,bad,TRUE,TRUE,FALSE,FALSE,FALSE,
-fb-survey,raw_wcli,FALSE,raw_wcli,FALSE,COVID-Like Symptoms,TRUE,Estimated percentage of people with COVID-like illness ,"{source_description} For this signal, we estimate the percentage of people self-reporting COVID-like symptoms, defined here as fever along with either cough, shortness of breath, or difficulty breathing. While many other conditions can cause these symptoms, comparing the rates of COVID-like symptoms across the country can suggest where COVID is most active.",day,Date,Percentage,percent,public,bad,FALSE,TRUE,FALSE,TRUE,TRUE,
+fb-survey,raw_wcli,FALSE,raw_wcli,FALSE,COVID-Like Symptoms,TRUE,Estimated percentage of people with COVID-like illness ,"{source_description} For this signal, we estimate the percentage of people self-reporting COVID-like symptoms, defined here as fever along with either cough, shortness of breath, or difficulty breathing. While many other conditions can cause these symptoms, comparing the rates of COVID-like symptoms across the country can suggest where COVID is most active.",day,Date,Percentage,percent,early,bad,FALSE,TRUE,FALSE,TRUE,TRUE,
fb-survey,raw_wcli,TRUE,raw_cli,FALSE,{base_name} (Unweighted),TRUE,,,day,Date,Percentage,percent,early,bad,FALSE,FALSE,FALSE,TRUE,TRUE,"[Survey details](https://delphi.cmu.edu/covidcast/surveys/)
[Technical description](https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/fb-survey.html#ili-and-cli-indicators)"
fb-survey,raw_wcli,TRUE,smoothed_cli,FALSE,{base_name} (Unweighted 7-day average),TRUE,,,day,Date,Percentage,percent,early,bad,TRUE,FALSE,FALSE,TRUE,TRUE,
-fb-survey,raw_wcli,TRUE,smoothed_wcli,FALSE,{base_name} (7-day average),TRUE,,,day,Date,Percentage,percent,public,bad,TRUE,TRUE,FALSE,TRUE,TRUE,
+fb-survey,raw_wcli,TRUE,smoothed_wcli,FALSE,{base_name} (7-day average),TRUE,,,day,Date,Percentage,percent,early,bad,TRUE,TRUE,FALSE,TRUE,TRUE,
fb-survey,raw_whh_cmnty_cli,FALSE,raw_whh_cmnty_cli,FALSE,COVID-Like Symptoms in Community,TRUE,Estimated percentage of people reporting illness in their local community,"{source_description} We also ask them if they know anyone in their local community who has COVID-like symptoms, defined here as fever along with either cough, shortness of breath, or difficulty breathing. For this indicator, we estimate the percentage of people who know someone, in their household or outside it, who has these symptoms. While many conditions can cause these symptoms, not just COVID, comparing the rates across the country can suggest where COVID is most active.",day,Date,Percentage,percent,early,bad,FALSE,TRUE,FALSE,TRUE,TRUE,
fb-survey,raw_whh_cmnty_cli,TRUE,raw_hh_cmnty_cli,FALSE,{base_name} (Unweighted),TRUE,,,day,Date,Percentage,percent,early,bad,FALSE,FALSE,FALSE,TRUE,TRUE,"[Survey details](https://delphi.cmu.edu/covidcast/surveys/)
[Technical description](https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/fb-survey.html#ili-and-cli-indicators)"
fb-survey,raw_whh_cmnty_cli,TRUE,smoothed_hh_cmnty_cli,FALSE,{base_name} (Unweighted 7-day average),TRUE,,,day,Date,Percentage,percent,early,bad,TRUE,FALSE,FALSE,TRUE,TRUE,
fb-survey,raw_whh_cmnty_cli,TRUE,smoothed_whh_cmnty_cli,FALSE,{base_name} (7-day average),TRUE,,,day,Date,Percentage,percent,early,bad,TRUE,TRUE,FALSE,TRUE,TRUE,
-fb-survey,raw_wili,FALSE,raw_wili,FALSE,Flu-Like Symptoms,TRUE,Estimated percentage of people with influenza-like illness ,"{source_description} For this signal, we estimate the percentage of people self-reporting influenza-like symptoms, defined here as fever along with either cough or sore throat. While many other conditions can cause these symptoms, comparing the rates of influenza-like symptoms across the country can suggest where the flu is most active.",day,Date,Percentage,percent,public,bad,FALSE,TRUE,FALSE,TRUE,TRUE,
+fb-survey,raw_wili,FALSE,raw_wili,FALSE,Flu-Like Symptoms,TRUE,Estimated percentage of people with influenza-like illness ,"{source_description} For this signal, we estimate the percentage of people self-reporting influenza-like symptoms, defined here as fever along with either cough or sore throat. While many other conditions can cause these symptoms, comparing the rates of influenza-like symptoms across the country can suggest where the flu is most active.",day,Date,Percentage,percent,early,bad,FALSE,TRUE,FALSE,TRUE,TRUE,
fb-survey,raw_wili,TRUE,raw_ili,FALSE,{base_name} (Unweighted),TRUE,,,day,Date,Percentage,percent,early,bad,FALSE,FALSE,FALSE,TRUE,TRUE,https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/fb-survey.html#ili-and-cli-indicators
fb-survey,raw_wili,TRUE,smoothed_ili,FALSE,{base_name} (Unweighted 7-day average),TRUE,,,day,Date,Percentage,percent,early,bad,TRUE,FALSE,FALSE,TRUE,TRUE,
-fb-survey,raw_wili,TRUE,smoothed_wili,FALSE,{base_name} (7-day average),TRUE,,,day,Date,Percentage,percent,public,bad,TRUE,TRUE,FALSE,TRUE,TRUE,
+fb-survey,raw_wili,TRUE,smoothed_wili,FALSE,{base_name} (7-day average),TRUE,,,day,Date,Percentage,percent,early,bad,TRUE,TRUE,FALSE,TRUE,TRUE,
fb-survey,raw_wnohh_cmnty_cli,FALSE,raw_wnohh_cmnty_cli,FALSE,COVID-Like Symptoms in Community Outside Household,TRUE,Estimated percentage of people reporting illness in their local community not including their household,"{source_description} We also ask them if they know anyone in their local community who has COVID-like symptoms, defined here as fever along with either cough, shortness of breath, or difficulty breathing. For this indicator, we estimate the percentage of people who know someone outside their household who has these symptoms. While many conditions can cause these symptoms, not just COVID, comparing the rates across the country can suggest where COVID is most active.",day,Date,Percentage,percent,early,bad,FALSE,TRUE,FALSE,TRUE,TRUE,
fb-survey,raw_wnohh_cmnty_cli,TRUE,raw_nohh_cmnty_cli,FALSE,{base_name} (Unweighted),TRUE,,,day,Date,Percentage,percent,early,bad,FALSE,FALSE,FALSE,TRUE,TRUE,https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/fb-survey.html#ili-and-cli-indicators
fb-survey,raw_wnohh_cmnty_cli,TRUE,smoothed_nohh_cmnty_cli,FALSE,{base_name} (Unweighted 7-day average),TRUE,,,day,Date,Percentage,percent,early,bad,TRUE,FALSE,FALSE,TRUE,TRUE,
@@ -292,8 +292,8 @@ ght,raw_search,,smoothed_search,FALSE,{base_name} (Gaussian smoothed),FALSE,,"{b
Discontinued March 8, 2021.",day,Date,Value,raw,public,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
google-survey,raw_cli,FALSE,raw_cli,FALSE,COVID-Like Illness,FALSE,Estimated percentage of people who know someone in their community with COVID-like illness.,"{short_description}
-Discontinued May 16, 2020.",day,Date,Value,raw,other,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
-google-survey,raw_cli,TRUE,smoothed_cli,FALSE,{base_name} (7-day average),FALSE,,,day,Date,Value,raw,other,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+Discontinued May 16, 2020.",day,Date,Value,raw,early,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+google-survey,raw_cli,TRUE,smoothed_cli,FALSE,{base_name} (7-day average),FALSE,,,day,Date,Value,raw,early,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
google-symptoms,ageusia_raw_search,FALSE,ageusia_raw_search,FALSE,Ageusia Searches,TRUE,"Google search volume for ageusia-related searches, in arbitrary units that are normalized for overall search users",,day,Date,Value,raw,public,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
google-symptoms,ageusia_raw_search,TRUE,ageusia_smoothed_search,TRUE,{base_name} (7-day average),TRUE,,,day,Date,Value,raw,public,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
google-symptoms,anosmia_raw_search,FALSE,anosmia_raw_search,FALSE,Anosmia Searches,TRUE,"Google search volume for anosmia-related searches, in arbitrary units that are normalized for overall search users ",,day,Date,Value,raw,public,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
@@ -308,6 +308,10 @@ hhs,sum_confirmed_suspected_admissions_covid_1d,FALSE,sum_confirmed_suspected_ad
hhs,sum_confirmed_suspected_admissions_covid_1d,TRUE,sum_confirmed_suspected_admissions_covid_1d_prop,FALSE,{base_name} (per 100k people),TRUE,,,day,Date,Value,per100k,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
hhs,sum_confirmed_suspected_admissions_covid_1d,,sum_confirmed_suspected_admissions_covid_1d_7dav,TRUE,{base_name} (7-day average),TRUE,,,day,Date,Value,count,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
hhs,sum_confirmed_suspected_admissions_covid_1d,,sum_confirmed_suspected_admissions_covid_1d_prop_7dav,FALSE,"{base_name} (7-day average, per 100k people)",TRUE,,,day,Date,Value,per100k,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+hhs,confirmed_admissions_influenza_1d,,confirmed_admissions_influenza_1d,FALSE,Confirmed Influenza Admissions per day,TRUE,All confirmed influenza hospital admissions occurring each day. ,,day,Date,Value,count,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+hhs,confirmed_admissions_influenza_1d,,confirmed_admissions_influenza_1d_prop,FALSE,{base_name} (per 100k people),TRUE,,,day,Date,Value,per100k,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+hhs,confirmed_admissions_influenza_1d,,confirmed_admissions_influenza_1d_7dav,FALSE,{base_name} (7-day average),TRUE,,,day,Date,Value,count,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+hhs,confirmed_admissions_influenza_1d,,confirmed_admissions_influenza_1d_prop_7dav,FALSE,"{base_name} (7-day average, per 100k people)",TRUE,,,day,Date,Value,per100k,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
hospital-admissions,smoothed_covid19,FALSE,smoothed_covid19,FALSE,COVID-19 Admissions (EMR and Claims),FALSE,Estimated percentage of new hospital admissions with COVID-associated diagnoses,"{short_description}, based on counts of electronic medical records and claims from health system partners, smoothed in time using a Gaussian linear smoother.
Discontinued October 1, 2020.",day,Date,Percentage,percent,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
@@ -316,18 +320,18 @@ hospital-admissions,smoothed_covid19,TRUE,smoothed_adj_covid19,FALSE,{base_name}
Discontinued October 1, 2020.",day,Date,Percentage,percent,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
hospital-admissions,smoothed_covid19_from_claims,FALSE,smoothed_covid19_from_claims,FALSE,COVID-19 Admissions (Claims),TRUE,Estimated percentage of new hospital admissions with COVID-associated diagnoses,"{short_description}, based on counts of claims from health system partners, smoothed in time using a Gaussian linear smoother.",day,Date,Percentage,percent,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
hospital-admissions,smoothed_covid19_from_claims,TRUE,smoothed_adj_covid19_from_claims,FALSE,{base_name} (Day-adjusted),TRUE,,"{base_short_description}, based on counts of claims from health system partners, smoothed in time using a Gaussian linear smoother, and adjusted to reduce day-of-week effects.",day,Date,Percentage,percent,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,FALSE,confirmed_cumulative_num,FALSE,Confirmed COVID Cases (Cumulative),TRUE,Cumulative confirmed COVID cases,Confirmed COVID-19 cases as reported by [USAFacts](https://usafacts.org/visualizations/coronavirus-covid-19-spread-map/) and [JHU-CSSE](https://github.com/CSSEGISandData/COVID-19),day,Date,Value,count,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_7dav_incidence_num,TRUE,"Confirmed COVID Cases (Daily new, 7-day average)",TRUE,"Daily new confirmed COVID cases, 7-day average ",,day,Date,Value,count,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_7dav_incidence_prop,FALSE,"Confirmed COVID Cases (Daily new, 7-day average, per 100k people)",TRUE,"Daily new confirmed COVID cases, 7-day average, per 100k people",,day,Date,Value,per100k,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_cumulative_prop,FALSE,"Confirmed COVID Cases (Cumulative, per 100k people)",TRUE,"Cumulative confirmed COVID cases, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_incidence_num,TRUE,Confirmed COVID Cases (Daily new),TRUE,Daily new confirmed COVID cases,,day,Date,Value,count,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_incidence_prop,FALSE,"Confirmed COVID Cases (Daily new, per 100k people)",TRUE,"Daily new confirmed COVID cases, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,FALSE,deaths_cumulative_num,FALSE,Confirmed COVID Deaths (Cumulative),TRUE,Cumulative confirmed COVID deaths,Confirmed COVID-19 deaths as reported by [USAFacts](https://usafacts.org/visualizations/coronavirus-covid-19-spread-map/) and [JHU-CSSE](https://github.com/CSSEGISandData/COVID-19),day,Date,Value,count,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_7dav_incidence_num,TRUE,"Confirmed COVID Deaths (Daily new, 7-day average)",TRUE,"Daily new confirmed COVID deaths, 7-day average ",,day,Date,Value,count,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_7dav_incidence_prop,FALSE,"Confirmed COVID Deaths (Daily new, 7-day average, per 100k people)",TRUE,"Daily new confirmed COVID deaths, 7-day average, per 100k people",,day,Date,Value,per100k,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_cumulative_prop,FALSE,"Confirmed COVID Deaths (Cumulative, per 100k people)",TRUE,"Cumulative confirmed COVID deaths, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_incidence_num,TRUE,Confirmed COVID Deaths (Daily new),TRUE,Daily new confirmed COVID deaths,,day,Date,Value,count,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_incidence_prop,FALSE,"Confirmed COVID Deaths (Daily new, per 100k people)",TRUE,"Daily new confirmed COVID deaths, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,FALSE,confirmed_cumulative_num,FALSE,Confirmed COVID Cases (Cumulative),FALSE,Cumulative confirmed COVID cases,Confirmed COVID-19 cases as reported by [USAFacts](https://usafacts.org/visualizations/coronavirus-covid-19-spread-map/) and [JHU-CSSE](https://github.com/CSSEGISandData/COVID-19),day,Date,Value,count,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_7dav_incidence_num,TRUE,"Confirmed COVID Cases (Daily new, 7-day average)",FALSE,"Daily new confirmed COVID cases, 7-day average ",,day,Date,Value,count,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_7dav_incidence_prop,FALSE,"Confirmed COVID Cases (Daily new, 7-day average, per 100k people)",FALSE,"Daily new confirmed COVID cases, 7-day average, per 100k people",,day,Date,Value,per100k,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_cumulative_prop,FALSE,"Confirmed COVID Cases (Cumulative, per 100k people)",FALSE,"Cumulative confirmed COVID cases, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_incidence_num,TRUE,Confirmed COVID Cases (Daily new),FALSE,Daily new confirmed COVID cases,,day,Date,Value,count,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_incidence_prop,FALSE,"Confirmed COVID Cases (Daily new, per 100k people)",FALSE,"Daily new confirmed COVID cases, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,FALSE,deaths_cumulative_num,FALSE,Confirmed COVID Deaths (Cumulative),FALSE,Cumulative confirmed COVID deaths,Confirmed COVID-19 deaths as reported by [USAFacts](https://usafacts.org/visualizations/coronavirus-covid-19-spread-map/) and [JHU-CSSE](https://github.com/CSSEGISandData/COVID-19),day,Date,Value,count,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_7dav_incidence_num,TRUE,"Confirmed COVID Deaths (Daily new, 7-day average)",FALSE,"Daily new confirmed COVID deaths, 7-day average ",,day,Date,Value,count,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_7dav_incidence_prop,FALSE,"Confirmed COVID Deaths (Daily new, 7-day average, per 100k people)",FALSE,"Daily new confirmed COVID deaths, 7-day average, per 100k people",,day,Date,Value,per100k,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_cumulative_prop,FALSE,"Confirmed COVID Deaths (Cumulative, per 100k people)",FALSE,"Cumulative confirmed COVID deaths, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_incidence_num,TRUE,Confirmed COVID Deaths (Daily new),FALSE,Daily new confirmed COVID deaths,,day,Date,Value,count,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_incidence_prop,FALSE,"Confirmed COVID Deaths (Daily new, per 100k people)",FALSE,"Daily new confirmed COVID deaths, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
indicator-combination-nmf,nmf_day_doc_fbc_fbs_ght,nmf_day_doc_fbc_fbs_ght,nmf_day_doc_fbc_fbs_ght,FALSE,NMF Combination (with community symptoms),FALSE,Rank-1 NMF approximation to reconstruct 4 other signals.,"This signal uses a rank-1 approximation, from a nonnegative matrix factorization approach, to identify an underlying signal that best reconstructs the Doctor Visits (smoothed_adj_cli), Facebook Symptoms surveys (smoothed_cli), Facebook Symptoms in Community surveys (smoothed_hh_cmnty_cli), and Search Trends (smoothed_search) indicators. It does not include official reports (cases and deaths from the jhu-csse source). Higher values of the combined signal correspond to higher values of the other indicators, but the scale (units) of the combination is arbitrary. Note that the Search Trends source is not available at the county level, so county values of this signal do not use it.
Discontinued March 17, 2021.",day,Date,Value,raw,early,bad,FALSE,FALSE,FALSE,TRUE,FALSE,
diff --git a/src/server/endpoints/covidcast_utils/db_sources.csv b/src/server/endpoints/covidcast_utils/db_sources.csv
index 7eba4b025..0d026df31 100644
--- a/src/server/endpoints/covidcast_utils/db_sources.csv
+++ b/src/server/endpoints/covidcast_utils/db_sources.csv
@@ -5,7 +5,7 @@ covid-act-now,covid-act-now,Covid Act Now (CAN),"COVID Act Now (CAN) tracks COVI
doctor-visits,doctor-visits,Doctor Visits From Claims,"Information about outpatient visits, provided to us by health system partners. Using outpatient claims counts, we estimate the percentage of COVID-related doctor's visits in a given location, on a given day.",smoothed_cli,CC BY,https://cmu.box.com/s/l2tz6kmiws6jyty2azwb43poiepz0565,[API Documentation](https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/doctor-visits.html)
fb-survey,fb-survey,Delphi US COVID-19 Trends and Impact Survey,"The Delphi US COVID-19 Trends and Impact Survey (CTIS), in partnership with the Facebook Company. Every day, Delphi surveys tens of thousands of Facebook users, asking them a broad set of COVID-related questions, including whether they, or anyone in their household, are currently experiencing COVID-related symptoms.",smoothed_cli,CC BY,https://cmu.box.com/s/qfxplcdrcn9retfzx4zniyugbd9h3bos,[API Documentation](https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/fb-survey.html)
google-symptoms,google-symptoms,Google Symptoms Search Trends,"Google's [COVID-19 Search Trends symptoms dataset](http://goo.gle/covid19symptomdataset) reflects the volume of Google searches for a broad set of symptoms, signs and health conditions. This source includes only searches which have been mapped to anosmia (lack of smell) and ageusia (lack of taste).",anosmia_smoothed_search,"To download or use the data, you must agree to the Google [Terms of Service](https://policies.google.com/terms)",,[API Documentation](https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/google-symptoms.html)
-hhs,hhs,U.S. Department of Health & Human Services,The US Department of Health & Human Services (HHS) publishes several datasets on patient impact and hospital capacity. This source includes only adult and pediatric hospital admissions with confirmed and suspected COVID-19.,confirmed_admissions_1d,ODBL,,[API Documentation](https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/hhs.html)
+hhs,hhs,U.S. Department of Health & Human Services,The US Department of Health & Human Services (HHS) publishes several datasets on patient impact and hospital capacity. This source includes only adult and pediatric hospital admissions with confirmed and suspected COVID-19 or confirmed influenza.,confirmed_admissions_1d,ODBL,,[API Documentation](https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/hhs.html)
hospital-admissions,hospital-admissions,Hospital Admissions From Claims,"Information about hospital admissions, provided to us by health system partners. Using inpatient claim counts, we estimate the percentage of new hospital admissions with a COVID-associated diagnosis code in a given location, on a given day.
See also our [Health & Human Services](https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/hhs.html) data source for official COVID hospitalization reporting from the US Department of Health & Human Services.",smoothed_covid19_from_claims,CC BY,https://cmu.box.com/s/l2tz6kmiws6jyty2azwb43poiepz0565,[API Documentation](https://cmu-delphi.github.io/delphi-epidata/api/covidcast-signals/hospital-admissions.html)