diff --git a/src/flask_covid19/blueprints/app_all/all_model.py b/src/flask_covid19/blueprints/app_all/all_model.py
index 3afa46b69e196a294a830808c2d817ac10f9d11e..b7572787c2d8a23c7d102411ac0217f0c2a49339 100644
--- a/src/flask_covid19/blueprints/app_all/all_model.py
+++ b/src/flask_covid19/blueprints/app_all/all_model.py
@@ -109,7 +109,9 @@ class BlueprintDateReported(BlueprintEntity):
     #
     date_reported_import_str = db.Column(db.String(255), nullable=False, unique=True)
     datum = db.Column(db.Date, nullable=False, unique=True)
+    #
     year_day_of_year = db.Column(db.String(255), nullable=False, unique=True)
+    #
     year_month = db.Column(db.String(255), nullable=False)
     year_week = db.Column(db.String(255), nullable=False)
     #
diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py
index 856d5aa05ca858831defc52a94363b683c0e11a5..31184859ac513f92dddf64966dabeed54bad8399 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py
@@ -24,22 +24,23 @@ class EcdcDateReported(BlueprintDateReported):
                                    self.year_day_of_year)
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
-    date_reported_import_str = db.Column(db.String(255), nullable=False, unique=True, index=True)
-    datum = db.Column(db.Date, nullable=False, unique=True, index=True)
-    year_day_of_year = db.Column(db.String(255), nullable=False, unique=True, index=True)
-    year_month = db.Column(db.String(255), nullable=False, index=True)
-    year_week = db.Column(db.String(255), nullable=False, index=True)
+    date_reported_import_str = db.Column(db.String(255), nullable=False, unique=True)
+    datum = db.Column(db.Date, nullable=False, unique=True)
     #
-    year = db.Column(db.Integer, nullable=False, index=True)
-    month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_week = db.Column(db.Integer, nullable=False, index=True)
-    day_of_year = db.Column(db.Integer, nullable=True, index=True)
-    week_of_year = db.Column(db.Integer, nullable=False, index=True)
+    year_day_of_year = db.Column(db.String(255), nullable=False, unique=True)
     #
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    year_month = db.Column(db.String(255), nullable=False)
+    year_week = db.Column(db.String(255), nullable=False)
+    #
+    year = db.Column(db.Integer, nullable=False)
+    month = db.Column(db.Integer, nullable=False)
+    day_of_month = db.Column(db.Integer, nullable=False)
+    day_of_week = db.Column(db.Integer, nullable=False)
+    day_of_year = db.Column(db.Integer, nullable=True)
+    week_of_year = db.Column(db.Integer, nullable=False)
 
     @classmethod
     @cache.memoize(50)
@@ -60,9 +61,9 @@ class EcdcContinent(BlueprintLocationGroup):
         return "%s(%s)" % (self.__class__.__name__, self.location_group)
 
     id = db.Column(db.Integer, primary_key=True)
-    location_group = db.Column(db.String(255), nullable=False, unique=True, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    location_group = db.Column(db.String(255), nullable=False, unique=True)
 
 
 class EcdcCountry(BlueprintLocation):
@@ -93,8 +94,11 @@ class EcdcCountry(BlueprintLocation):
              + " | " + self.geo_id
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
     # country_territory_code = db.Column(db.String(255), nullable=False)
-    location_code = db.Column(db.String(255), nullable=True, index=True)
+    location_code = db.Column(db.String(255), nullable=True)
     # countries_and_territories = db.Column(db.String(255), nullable=False)
     location = db.Column(db.String(255), nullable=False, index=True)
     location_group_id = db.Column(db.Integer, db.ForeignKey('ecdc_country_continent.id'), nullable=False)
@@ -103,10 +107,8 @@ class EcdcCountry(BlueprintLocation):
         lazy='subquery', cascade="all, delete",
         order_by='asc(EcdcContinent.location_group)'
     )
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
-    pop_data_2019 = db.Column(db.String(255), nullable=False, index=True)
-    geo_id = db.Column(db.String(255), nullable=False, index=True)
+    pop_data_2019 = db.Column(db.String(255), nullable=False)
+    geo_id = db.Column(db.String(255), nullable=False)
 
     @classmethod
     def get_by(cls, location: str = '', geo_id: str = '', location_code: str = ''):
@@ -158,6 +160,9 @@ class EcdcData(BlueprintFactTable):
         return "%s(%s %s)" % (self.__class__.__name__, self.date_reported.__repr__(), self.location.__repr__())
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
     date_reported_id = db.Column(db.Integer, db.ForeignKey('ecdc_date_reported.id'), nullable=False)
     date_reported = db.relationship(
         'EcdcDateReported',
@@ -170,12 +175,10 @@ class EcdcData(BlueprintFactTable):
         lazy='joined',
         cascade='save-update',
         order_by='asc(EcdcCountry.location)')
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
     #
-    deaths = db.Column(db.Integer, nullable=False, index=True)
-    cases = db.Column(db.Integer, nullable=False, index=True)
-    cumulative_number_for_14_days_of_covid19_cases_per_100000 = db.Column(db.Float, nullable=False, index=True)
+    deaths = db.Column(db.Integer, nullable=False)
+    cases = db.Column(db.Integer, nullable=False)
+    cumulative_number_for_14_days_of_covid19_cases_per_100000 = db.Column(db.Float, nullable=False)
 
     @classmethod
     def __query_by_date_reported(cls, date_reported: EcdcDateReported):
diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_model_import.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_model_import.py
index 8d914dc13170f2e90460e94ebf0b568704fc0734..3424bedcf32b8d015bddb28ac90bcf2a4b87c63b 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_model_import.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_model_import.py
@@ -14,26 +14,27 @@ class EcdcImport(AllImport):
                            self.continent_exp)
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
     date_reported_import_str = db.Column(db.String(255), nullable=False, index=True)
     datum = db.Column(db.Date, nullable=False, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
     #
-    date_rep = db.Column(db.String(255), nullable=False, index=True)
-    day = db.Column(db.String(255), nullable=False, index=True)
-    month = db.Column(db.String(255), nullable=False, index=True)
-    year = db.Column(db.String(255), nullable=False, index=True)
+    date_rep = db.Column(db.String(255), nullable=False)
+    day = db.Column(db.String(255), nullable=False)
+    month = db.Column(db.String(255), nullable=False)
+    year = db.Column(db.String(255), nullable=False)
     #
-    cases = db.Column(db.String(255), nullable=False, index=True)
-    deaths = db.Column(db.String(255), nullable=False, index=True)
-    pop_data_2019 = db.Column(db.String(255), nullable=False, index=True)
+    cases = db.Column(db.String(255), nullable=False)
+    deaths = db.Column(db.String(255), nullable=False)
+    pop_data_2019 = db.Column(db.String(255), nullable=False)
     #
     countries_and_territories = db.Column(db.String(255), nullable=False, index=True)
-    geo_id = db.Column(db.String(255), nullable=False, index=True)
-    country_territory_code = db.Column(db.String(255), nullable=False, index=True)
+    geo_id = db.Column(db.String(255), nullable=False)
+    country_territory_code = db.Column(db.String(255), nullable=False)
     continent_exp = db.Column(db.String(255), nullable=False, index=True)
     #
-    cumulative_number_for_14_days_of_covid19_cases_per_100000 = db.Column(db.String(255), nullable=False, index=True)
+    cumulative_number_for_14_days_of_covid19_cases_per_100000 = db.Column(db.String(255), nullable=False)
 
     @classmethod
     @cache.memoize(50)
@@ -155,29 +156,29 @@ class EcdcFlat(AllFlat):
                                     self.location_group.__repr__())
 
     id = db.Column(db.Integer, primary_key=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
     date_reported_import_str = db.Column(db.String(255), nullable=False, index=True)
     datum = db.Column(db.Date, nullable=False, index=True)
     location = db.Column(db.String(255), nullable=False, index=True)
     location_group = db.Column(db.String(255), nullable=False, index=True)
-    location_code = db.Column(db.String(255), nullable=False, index=True)
+    location_code = db.Column(db.String(255), nullable=False)
     #
-    year = db.Column(db.Integer, nullable=False, index=True)
-    year_month = db.Column(db.String(255), nullable=False, index=True)
-    year_week = db.Column(db.String(255), nullable=False, index=True)
-    year_day_of_year = db.Column(db.String(255), nullable=False, index=True)
+    year = db.Column(db.Integer, nullable=False)
+    year_month = db.Column(db.String(255), nullable=False)
+    year_week = db.Column(db.String(255), nullable=False)
+    year_day_of_year = db.Column(db.String(255), nullable=False)
     #
-    month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_week = db.Column(db.Integer, nullable=False, index=True)
-    week_of_year = db.Column(db.Integer, nullable=False, index=True)
-    day_of_year = db.Column(db.Integer, nullable=False, index=True)
+    month = db.Column(db.Integer, nullable=False)
+    day_of_month = db.Column(db.Integer, nullable=False)
+    day_of_week = db.Column(db.Integer, nullable=False)
+    week_of_year = db.Column(db.Integer, nullable=False)
+    day_of_year = db.Column(db.Integer, nullable=False)
     #
-    cases = db.Column(db.String(255), nullable=False, index=True)
-    deaths = db.Column(db.String(255), nullable=False, index=True)
-    geo_id = db.Column(db.String(255), nullable=False, index=True)
-    pop_data_2019 = db.Column(db.String(255), nullable=False, index=True)
-    cumulative_number_for_14_days_of_covid19_cases_per_100000 = db.Column(db.String(255), nullable=False, index=True)
+    cases = db.Column(db.String(255), nullable=False)
+    deaths = db.Column(db.String(255), nullable=False)
+    geo_id = db.Column(db.String(255), nullable=False)
+    pop_data_2019 = db.Column(db.String(255), nullable=False)
+    cumulative_number_for_14_days_of_covid19_cases_per_100000 = db.Column(db.String(255), nullable=False)
 
diff --git a/src/flask_covid19/blueprints/data_owid/owid_model.py b/src/flask_covid19/blueprints/data_owid/owid_model.py
index 9b45038a1ae51f6f5a78468d9e3bb49359c15aef..cf2498fe15c768d5170a1805aa7fe66053fc2229 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_model.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_model.py
@@ -23,22 +23,23 @@ class OwidDateReported(BlueprintDateReported):
                                    self.date_reported_import_str, self.datum.isoformat(), self.year_day_of_year)
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
     date_reported_import_str = db.Column(db.String(255), nullable=False, unique=True)
     datum = db.Column(db.Date, nullable=False, unique=True)
+    #
     year_day_of_year = db.Column(db.String(255), nullable=False, unique=True)
-    year_month = db.Column(db.String(255), nullable=False, index=True)
-    year_week = db.Column(db.String(255), nullable=False, index=True)
     #
-    year = db.Column(db.Integer, nullable=False, index=True)
-    month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_week = db.Column(db.Integer, nullable=False, index=True)
-    day_of_year = db.Column(db.Integer, nullable=True)
-    week_of_year = db.Column(db.Integer, nullable=False, index=True)
+    year_month = db.Column(db.String(255), nullable=False)
+    year_week = db.Column(db.String(255), nullable=False)
     #
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    year = db.Column(db.Integer, nullable=False)
+    month = db.Column(db.Integer, nullable=False)
+    day_of_month = db.Column(db.Integer, nullable=False)
+    day_of_week = db.Column(db.Integer, nullable=False)
+    day_of_year = db.Column(db.Integer, nullable=True)
+    week_of_year = db.Column(db.Integer, nullable=False)
 
 
 class OwidContinent(BlueprintLocationGroup):
@@ -56,9 +57,10 @@ class OwidContinent(BlueprintLocationGroup):
         return result
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
     location_group = db.Column(db.String(255), nullable=False, unique=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
 
 
 class OwidCountry(BlueprintLocation):
@@ -79,32 +81,34 @@ class OwidCountry(BlueprintLocation):
         return result
 
     id = db.Column(db.Integer, primary_key=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
     location_group_id = db.Column(db.Integer, db.ForeignKey('owid_country_continent.id'), nullable=False, index=True)
     location_group = db.relationship(
         'OwidContinent',
         lazy='joined',
         cascade='save-update',
         order_by='desc(OwidContinent.location_group)')
+    #
     # iso_code = db.Column(db.String(255), nullable=False, index=True)
-    location_code = db.Column(db.String(255), nullable=False, index=True)
+    location_code = db.Column(db.String(255), nullable=False)
     location = db.Column(db.String(255), nullable=False, index=True)
-    population = db.Column(db.String(255), nullable=False, index=True)
-    population_density = db.Column(db.String(255), nullable=False, index=True)
-    median_age = db.Column(db.String(255), nullable=False, index=True)
-    aged_65_older = db.Column(db.String(255), nullable=False, index=True)
-    aged_70_older = db.Column(db.String(255), nullable=False, index=True)
-    gdp_per_capita = db.Column(db.String(255), nullable=False, index=True)
-    extreme_poverty = db.Column(db.String(255), nullable=False, index=True)
-    cardiovasc_death_rate = db.Column(db.String(255), nullable=False, index=True)
-    diabetes_prevalence = db.Column(db.String(255), nullable=False, index=True)
-    female_smokers = db.Column(db.String(255), nullable=False, index=True)
-    male_smokers = db.Column(db.String(255), nullable=False, index=True)
-    handwashing_facilities = db.Column(db.String(255), nullable=False, index=True)
-    hospital_beds_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    life_expectancy = db.Column(db.String(255), nullable=False, index=True)
-    human_development_index = db.Column(db.String(255), nullable=False, index=True)
+    population = db.Column(db.String(255), nullable=False)
+    population_density = db.Column(db.String(255), nullable=False)
+    median_age = db.Column(db.String(255), nullable=False)
+    aged_65_older = db.Column(db.String(255), nullable=False)
+    aged_70_older = db.Column(db.String(255), nullable=False)
+    gdp_per_capita = db.Column(db.String(255), nullable=False)
+    extreme_poverty = db.Column(db.String(255), nullable=False)
+    cardiovasc_death_rate = db.Column(db.String(255), nullable=False)
+    diabetes_prevalence = db.Column(db.String(255), nullable=False)
+    female_smokers = db.Column(db.String(255), nullable=False)
+    male_smokers = db.Column(db.String(255), nullable=False)
+    handwashing_facilities = db.Column(db.String(255), nullable=False)
+    hospital_beds_per_thousand = db.Column(db.String(255), nullable=False)
+    life_expectancy = db.Column(db.String(255), nullable=False)
+    human_development_index = db.Column(db.String(255), nullable=False)
 
     @classmethod
     def delete_all_countries_for_continent(cls, owid_continent_one):
@@ -151,6 +155,9 @@ class OwidData(BlueprintFactTable):
         return "%s(%s %s)" % (self.__class__.__name__, self.date_reported.__repr__(), self.location.__repr__())
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    #
     date_reported_id = db.Column(db.Integer, db.ForeignKey('owid_date_reported.id'), nullable=False, index=True)
     date_reported = db.relationship(
         'OwidDateReported',
@@ -163,49 +170,47 @@ class OwidData(BlueprintFactTable):
         lazy='joined',
         cascade='save-update',
         order_by='asc(OwidCountry.location)')
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
     #
     total_cases = db.Column(db.String(255), nullable=False, index=True)
     new_cases = db.Column(db.String(255), nullable=False, index=True)
-    new_cases_smoothed = db.Column(db.String(255), nullable=False, index=True)
+    new_cases_smoothed = db.Column(db.String(255), nullable=False)
     total_deaths = db.Column(db.String(255), nullable=False, index=True)
     new_deaths = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths_smoothed = db.Column(db.String(255), nullable=False, index=True)
+    new_deaths_smoothed = db.Column(db.String(255), nullable=False)
     total_cases_per_million = db.Column(db.String(255), nullable=False, index=True)
     new_cases_per_million = db.Column(db.String(255), nullable=False, index=True)
     new_cases_smoothed_per_million = db.Column(db.String(255), nullable=False, index=True)
     total_deaths_per_million = db.Column(db.String(255), nullable=False, index=True)
     new_deaths_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths_smoothed_per_million = db.Column(db.String(255), nullable=False, index=True)
-    reproduction_rate = db.Column(db.String(255), nullable=False, index=True)
-    icu_patients = db.Column(db.String(255), nullable=False, index=True)
-    icu_patients_per_million = db.Column(db.String(255), nullable=False, index=True)
-    hosp_patients = db.Column(db.String(255), nullable=False, index=True)
-    hosp_patients_per_million = db.Column(db.String(255), nullable=False, index=True)
-    weekly_icu_admissions = db.Column(db.String(255), nullable=False, index=True)
-    weekly_icu_admissions_per_million = db.Column(db.String(255), nullable=False, index=True)
-    weekly_hosp_admissions = db.Column(db.String(255), nullable=False, index=True)
-    weekly_hosp_admissions_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_tests = db.Column(db.String(255), nullable=False, index=True)
-    total_tests = db.Column(db.String(255), nullable=False, index=True)
-    total_tests_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    new_tests_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    new_tests_smoothed = db.Column(db.String(255), nullable=False, index=True)
-    new_tests_smoothed_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    positive_rate = db.Column(db.String(255), nullable=False, index=True)
-    tests_per_case = db.Column(db.String(255), nullable=False, index=True)
-    tests_units = db.Column(db.String(255), nullable=False, index=True)
-    total_vaccinations = db.Column(db.String(255), nullable=False, index=True)
-    people_vaccinated = db.Column(db.String(255), nullable=False, index=True)
-    people_fully_vaccinated = db.Column(db.String(255), nullable=False, index=True)
-    new_vaccinations = db.Column(db.String(255), nullable=False, index=True)
-    new_vaccinations_smoothed = db.Column(db.String(255), nullable=False, index=True)
-    total_vaccinations_per_hundred = db.Column(db.String(255), nullable=False, index=True)
-    people_vaccinated_per_hundred = db.Column(db.String(255), nullable=False, index=True)
-    people_fully_vaccinated_per_hundred = db.Column(db.String(255), nullable=False, index=True)
-    new_vaccinations_smoothed_per_million = db.Column(db.String(255), nullable=False, index=True)
-    stringency_index = db.Column(db.String(255), nullable=False, index=True)
+    new_deaths_smoothed_per_million = db.Column(db.String(255), nullable=False)
+    reproduction_rate = db.Column(db.String(255), nullable=False)
+    icu_patients = db.Column(db.String(255), nullable=False)
+    icu_patients_per_million = db.Column(db.String(255), nullable=False)
+    hosp_patients = db.Column(db.String(255), nullable=False)
+    hosp_patients_per_million = db.Column(db.String(255), nullable=False)
+    weekly_icu_admissions = db.Column(db.String(255), nullable=False)
+    weekly_icu_admissions_per_million = db.Column(db.String(255), nullable=False)
+    weekly_hosp_admissions = db.Column(db.String(255), nullable=False)
+    weekly_hosp_admissions_per_million = db.Column(db.String(255), nullable=False)
+    new_tests = db.Column(db.String(255), nullable=False)
+    total_tests = db.Column(db.String(255), nullable=False)
+    total_tests_per_thousand = db.Column(db.String(255), nullable=False)
+    new_tests_per_thousand = db.Column(db.String(255), nullable=False)
+    new_tests_smoothed = db.Column(db.String(255), nullable=False)
+    new_tests_smoothed_per_thousand = db.Column(db.String(255), nullable=False)
+    positive_rate = db.Column(db.String(255), nullable=False)
+    tests_per_case = db.Column(db.String(255), nullable=False)
+    tests_units = db.Column(db.String(255), nullable=False)
+    total_vaccinations = db.Column(db.String(255), nullable=False)
+    people_vaccinated = db.Column(db.String(255), nullable=False)
+    people_fully_vaccinated = db.Column(db.String(255), nullable=False)
+    new_vaccinations = db.Column(db.String(255), nullable=False)
+    new_vaccinations_smoothed = db.Column(db.String(255), nullable=False)
+    total_vaccinations_per_hundred = db.Column(db.String(255), nullable=False)
+    people_vaccinated_per_hundred = db.Column(db.String(255), nullable=False)
+    people_fully_vaccinated_per_hundred = db.Column(db.String(255), nullable=False)
+    new_vaccinations_smoothed_per_million = db.Column(db.String(255), nullable=False)
+    stringency_index = db.Column(db.String(255), nullable=False)
 
     @classmethod
     def __query_by_location(cls, location: OwidCountry):
diff --git a/src/flask_covid19/blueprints/data_owid/owid_model_import.py b/src/flask_covid19/blueprints/data_owid/owid_model_import.py
index 8f629551d57f6986d69fcf2b053de2d89b4fe76e..cdbfda9c335063faf358de93e404a33d94b3e8ae 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_model_import.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_model_import.py
@@ -15,70 +15,71 @@ class OwidImport(AllImport):
         return self.datum.isoformat() + " " + self.iso_code + " " + self.location + " " + str(self.continent)
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
     date_reported_import_str = db.Column(db.String(255), nullable=False, index=True)
     datum = db.Column(db.Date, nullable=False, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
     #
-    iso_code = db.Column(db.String(255), nullable=False, index=True)
+    iso_code = db.Column(db.String(255), nullable=False)
     continent = db.Column(db.String(255), nullable=False, index=True)
     location = db.Column(db.String(255), nullable=False, index=True)
-    date = db.Column(db.String(255), nullable=False, index=True)
-    total_cases = db.Column(db.String(255), nullable=False, index=True)
-    new_cases = db.Column(db.String(255), nullable=False, index=True)
-    new_cases_smoothed = db.Column(db.String(255), nullable=False, index=True)
-    total_deaths = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths_smoothed = db.Column(db.String(255), nullable=False, index=True)
-    total_cases_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_cases_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_cases_smoothed_per_million = db.Column(db.String(255), nullable=False, index=True)
-    total_deaths_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths_smoothed_per_million = db.Column(db.String(255), nullable=False, index=True)
-    reproduction_rate = db.Column(db.String(255), nullable=False, index=True)
-    icu_patients = db.Column(db.String(255), nullable=False, index=True)
-    icu_patients_per_million = db.Column(db.String(255), nullable=False, index=True)
-    hosp_patients = db.Column(db.String(255), nullable=False, index=True)
-    hosp_patients_per_million = db.Column(db.String(255), nullable=False, index=True)
-    weekly_icu_admissions = db.Column(db.String(255), nullable=False, index=True)
-    weekly_icu_admissions_per_million = db.Column(db.String(255), nullable=False, index=True)
-    weekly_hosp_admissions = db.Column(db.String(255), nullable=False, index=True)
-    weekly_hosp_admissions_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_tests = db.Column(db.String(255), nullable=False, index=True)
-    total_tests = db.Column(db.String(255), nullable=False, index=True)
-    total_tests_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    new_tests_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    new_tests_smoothed = db.Column(db.String(255), nullable=False, index=True)
-    new_tests_smoothed_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    positive_rate = db.Column(db.String(255), nullable=False, index=True)
-    tests_per_case = db.Column(db.String(255), nullable=False, index=True)
-    tests_units = db.Column(db.String(255), nullable=False, index=True)
-    total_vaccinations = db.Column(db.String(255), nullable=False, index=True)
-    people_vaccinated = db.Column(db.String(255), nullable=False, index=True)
-    people_fully_vaccinated = db.Column(db.String(255), nullable=False, index=True)
-    new_vaccinations = db.Column(db.String(255), nullable=False, index=True)
-    new_vaccinations_smoothed = db.Column(db.String(255), nullable=False, index=True)
-    total_vaccinations_per_hundred = db.Column(db.String(255), nullable=False, index=True)
-    people_vaccinated_per_hundred = db.Column(db.String(255), nullable=False, index=True)
-    people_fully_vaccinated_per_hundred = db.Column(db.String(255), nullable=False, index=True)
-    new_vaccinations_smoothed_per_million = db.Column(db.String(255), nullable=False, index=True)
-    stringency_index = db.Column(db.String(255), nullable=False, index=True)
-    population = db.Column(db.String(255), nullable=False, index=True)
-    population_density = db.Column(db.String(255), nullable=False, index=True)
-    median_age = db.Column(db.String(255), nullable=False, index=True)
-    aged_65_older = db.Column(db.String(255), nullable=False, index=True)
-    aged_70_older = db.Column(db.String(255), nullable=False, index=True)
-    gdp_per_capita = db.Column(db.String(255), nullable=False, index=True)
-    extreme_poverty = db.Column(db.String(255), nullable=False, index=True)
-    cardiovasc_death_rate = db.Column(db.String(255), nullable=False, index=True)
-    diabetes_prevalence = db.Column(db.String(255), nullable=False, index=True)
-    female_smokers = db.Column(db.String(255), nullable=False, index=True)
-    male_smokers = db.Column(db.String(255), nullable=False, index=True)
-    handwashing_facilities = db.Column(db.String(255), nullable=False, index=True)
-    hospital_beds_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    life_expectancy = db.Column(db.String(255), nullable=False, index=True)
-    human_development_index = db.Column(db.String(255), nullable=False, index=True)
+    date = db.Column(db.String(255), nullable=False)
+    total_cases = db.Column(db.String(255), nullable=False)
+    new_cases = db.Column(db.String(255), nullable=False)
+    new_cases_smoothed = db.Column(db.String(255), nullable=False)
+    total_deaths = db.Column(db.String(255), nullable=False)
+    new_deaths = db.Column(db.String(255), nullable=False)
+    new_deaths_smoothed = db.Column(db.String(255), nullable=False)
+    total_cases_per_million = db.Column(db.String(255), nullable=False)
+    new_cases_per_million = db.Column(db.String(255), nullable=False)
+    new_cases_smoothed_per_million = db.Column(db.String(255), nullable=False)
+    total_deaths_per_million = db.Column(db.String(255), nullable=False)
+    new_deaths_per_million = db.Column(db.String(255), nullable=False)
+    new_deaths_smoothed_per_million = db.Column(db.String(255), nullable=False)
+    reproduction_rate = db.Column(db.String(255), nullable=False)
+    icu_patients = db.Column(db.String(255), nullable=False)
+    icu_patients_per_million = db.Column(db.String(255), nullable=False)
+    hosp_patients = db.Column(db.String(255), nullable=False)
+    hosp_patients_per_million = db.Column(db.String(255), nullable=False)
+    weekly_icu_admissions = db.Column(db.String(255), nullable=False)
+    weekly_icu_admissions_per_million = db.Column(db.String(255), nullable=False)
+    weekly_hosp_admissions = db.Column(db.String(255), nullable=False)
+    weekly_hosp_admissions_per_million = db.Column(db.String(255), nullable=False)
+    new_tests = db.Column(db.String(255), nullable=False)
+    total_tests = db.Column(db.String(255), nullable=False)
+    total_tests_per_thousand = db.Column(db.String(255), nullable=False)
+    new_tests_per_thousand = db.Column(db.String(255), nullable=False)
+    new_tests_smoothed = db.Column(db.String(255), nullable=False)
+    new_tests_smoothed_per_thousand = db.Column(db.String(255), nullable=False)
+    positive_rate = db.Column(db.String(255), nullable=False)
+    tests_per_case = db.Column(db.String(255), nullable=False)
+    tests_units = db.Column(db.String(255), nullable=False)
+    total_vaccinations = db.Column(db.String(255), nullable=False)
+    people_vaccinated = db.Column(db.String(255), nullable=False)
+    people_fully_vaccinated = db.Column(db.String(255), nullable=False)
+    new_vaccinations = db.Column(db.String(255), nullable=False)
+    new_vaccinations_smoothed = db.Column(db.String(255), nullable=False)
+    total_vaccinations_per_hundred = db.Column(db.String(255), nullable=False)
+    people_vaccinated_per_hundred = db.Column(db.String(255), nullable=False)
+    people_fully_vaccinated_per_hundred = db.Column(db.String(255), nullable=False)
+    new_vaccinations_smoothed_per_million = db.Column(db.String(255), nullable=False)
+    stringency_index = db.Column(db.String(255), nullable=False)
+    population = db.Column(db.String(255), nullable=False)
+    population_density = db.Column(db.String(255), nullable=False)
+    median_age = db.Column(db.String(255), nullable=False)
+    aged_65_older = db.Column(db.String(255), nullable=False)
+    aged_70_older = db.Column(db.String(255), nullable=False)
+    gdp_per_capita = db.Column(db.String(255), nullable=False)
+    extreme_poverty = db.Column(db.String(255), nullable=False)
+    cardiovasc_death_rate = db.Column(db.String(255), nullable=False)
+    diabetes_prevalence = db.Column(db.String(255), nullable=False)
+    female_smokers = db.Column(db.String(255), nullable=False)
+    male_smokers = db.Column(db.String(255), nullable=False)
+    handwashing_facilities = db.Column(db.String(255), nullable=False)
+    hospital_beds_per_thousand = db.Column(db.String(255), nullable=False)
+    life_expectancy = db.Column(db.String(255), nullable=False)
+    human_development_index = db.Column(db.String(255), nullable=False)
 
     @classmethod
     def get_dates(cls):
@@ -273,78 +274,78 @@ class OwidFlat(AllFlat):
         return self.datum.isoformat() + " " + self.location_code + " " + self.location + " " + str(self.location_group)
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
     date_reported_import_str = db.Column(db.String(255), nullable=False, index=True)
     datum = db.Column(db.Date, nullable=False, index=True)
     #
-    year = db.Column(db.Integer, nullable=False, index=True)
-    year_month = db.Column(db.String(255), nullable=False, index=True)
-    year_week = db.Column(db.String(255), nullable=False, index=True)
-    year_day_of_year = db.Column(db.String(255), nullable=False, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    year = db.Column(db.Integer, nullable=False)
+    year_month = db.Column(db.String(255), nullable=False)
+    year_week = db.Column(db.String(255), nullable=False)
+    year_day_of_year = db.Column(db.String(255), nullable=False)
     #
-    month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_week = db.Column(db.Integer, nullable=False, index=True)
-    week_of_year = db.Column(db.Integer, nullable=False, index=True)
-    day_of_year = db.Column(db.Integer, nullable=False, index=True)
+    month = db.Column(db.Integer, nullable=False)
+    day_of_month = db.Column(db.Integer, nullable=False)
+    day_of_week = db.Column(db.Integer, nullable=False)
+    week_of_year = db.Column(db.Integer, nullable=False)
+    day_of_year = db.Column(db.Integer, nullable=False)
     location = db.Column(db.String(255), nullable=False, index=True)
     location_group = db.Column(db.String(255), nullable=False, index=True)
-    location_code = db.Column(db.String(255), nullable=False, index=True)
+    location_code = db.Column(db.String(255), nullable=False)
     #
-    total_cases = db.Column(db.String(255), nullable=False, index=True)
-    new_cases = db.Column(db.String(255), nullable=False, index=True)
-    new_cases_smoothed = db.Column(db.String(255), nullable=False, index=True)
-    total_deaths = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths_smoothed = db.Column(db.String(255), nullable=False, index=True)
-    total_cases_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_cases_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_cases_smoothed_per_million = db.Column(db.String(255), nullable=False, index=True)
-    total_deaths_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths_smoothed_per_million = db.Column(db.String(255), nullable=False, index=True)
-    reproduction_rate = db.Column(db.String(255), nullable=False, index=True)
-    icu_patients = db.Column(db.String(255), nullable=False, index=True)
-    icu_patients_per_million = db.Column(db.String(255), nullable=False, index=True)
-    hosp_patients = db.Column(db.String(255), nullable=False, index=True)
-    hosp_patients_per_million = db.Column(db.String(255), nullable=False, index=True)
-    weekly_icu_admissions = db.Column(db.String(255), nullable=False, index=True)
-    weekly_icu_admissions_per_million = db.Column(db.String(255), nullable=False, index=True)
-    weekly_hosp_admissions = db.Column(db.String(255), nullable=False, index=True)
-    weekly_hosp_admissions_per_million = db.Column(db.String(255), nullable=False, index=True)
-    new_tests = db.Column(db.String(255), nullable=False, index=True)
-    total_tests = db.Column(db.String(255), nullable=False, index=True)
-    total_tests_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    new_tests_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    new_tests_smoothed = db.Column(db.String(255), nullable=False, index=True)
-    new_tests_smoothed_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    positive_rate = db.Column(db.String(255), nullable=False, index=True)
-    tests_per_case = db.Column(db.String(255), nullable=False, index=True)
-    tests_units = db.Column(db.String(255), nullable=False, index=True)
-    total_vaccinations = db.Column(db.String(255), nullable=False, index=True)
-    people_vaccinated = db.Column(db.String(255), nullable=False, index=True)
-    people_fully_vaccinated = db.Column(db.String(255), nullable=False, index=True)
-    new_vaccinations = db.Column(db.String(255), nullable=False, index=True)
-    new_vaccinations_smoothed = db.Column(db.String(255), nullable=False, index=True)
-    total_vaccinations_per_hundred = db.Column(db.String(255), nullable=False, index=True)
-    people_vaccinated_per_hundred = db.Column(db.String(255), nullable=False, index=True)
-    people_fully_vaccinated_per_hundred = db.Column(db.String(255), nullable=False, index=True)
-    new_vaccinations_smoothed_per_million = db.Column(db.String(255), nullable=False, index=True)
-    stringency_index = db.Column(db.String(255), nullable=False, index=True)
-    population = db.Column(db.String(255), nullable=False, index=True)
-    population_density = db.Column(db.String(255), nullable=False, index=True)
-    median_age = db.Column(db.String(255), nullable=False, index=True)
-    aged_65_older = db.Column(db.String(255), nullable=False, index=True)
-    aged_70_older = db.Column(db.String(255), nullable=False, index=True)
-    gdp_per_capita = db.Column(db.String(255), nullable=False, index=True)
-    extreme_poverty = db.Column(db.String(255), nullable=False, index=True)
-    cardiovasc_death_rate = db.Column(db.String(255), nullable=False, index=True)
-    diabetes_prevalence = db.Column(db.String(255), nullable=False, index=True)
-    female_smokers = db.Column(db.String(255), nullable=False, index=True)
-    male_smokers = db.Column(db.String(255), nullable=False, index=True)
-    handwashing_facilities = db.Column(db.String(255), nullable=False, index=True)
-    hospital_beds_per_thousand = db.Column(db.String(255), nullable=False, index=True)
-    life_expectancy = db.Column(db.String(255), nullable=False, index=True)
-    human_development_index = db.Column(db.String(255), nullable=False, index=True)
+    total_cases = db.Column(db.String(255), nullable=False)
+    new_cases = db.Column(db.String(255), nullable=False)
+    new_cases_smoothed = db.Column(db.String(255), nullable=False)
+    total_deaths = db.Column(db.String(255), nullable=False)
+    new_deaths = db.Column(db.String(255), nullable=False)
+    new_deaths_smoothed = db.Column(db.String(255), nullable=False)
+    total_cases_per_million = db.Column(db.String(255), nullable=False)
+    new_cases_per_million = db.Column(db.String(255), nullable=False)
+    new_cases_smoothed_per_million = db.Column(db.String(255), nullable=False)
+    total_deaths_per_million = db.Column(db.String(255), nullable=False)
+    new_deaths_per_million = db.Column(db.String(255), nullable=False)
+    new_deaths_smoothed_per_million = db.Column(db.String(255), nullable=False)
+    reproduction_rate = db.Column(db.String(255), nullable=False)
+    icu_patients = db.Column(db.String(255), nullable=False)
+    icu_patients_per_million = db.Column(db.String(255), nullable=False)
+    hosp_patients = db.Column(db.String(255), nullable=False)
+    hosp_patients_per_million = db.Column(db.String(255), nullable=False)
+    weekly_icu_admissions = db.Column(db.String(255), nullable=False)
+    weekly_icu_admissions_per_million = db.Column(db.String(255), nullable=False)
+    weekly_hosp_admissions = db.Column(db.String(255), nullable=False)
+    weekly_hosp_admissions_per_million = db.Column(db.String(255), nullable=False)
+    new_tests = db.Column(db.String(255), nullable=False)
+    total_tests = db.Column(db.String(255), nullable=False)
+    total_tests_per_thousand = db.Column(db.String(255), nullable=False)
+    new_tests_per_thousand = db.Column(db.String(255), nullable=False)
+    new_tests_smoothed = db.Column(db.String(255), nullable=False)
+    new_tests_smoothed_per_thousand = db.Column(db.String(255), nullable=False)
+    positive_rate = db.Column(db.String(255), nullable=False)
+    tests_per_case = db.Column(db.String(255), nullable=False)
+    tests_units = db.Column(db.String(255), nullable=False)
+    total_vaccinations = db.Column(db.String(255), nullable=False)
+    people_vaccinated = db.Column(db.String(255), nullable=False)
+    people_fully_vaccinated = db.Column(db.String(255), nullable=False)
+    new_vaccinations = db.Column(db.String(255), nullable=False)
+    new_vaccinations_smoothed = db.Column(db.String(255), nullable=False)
+    total_vaccinations_per_hundred = db.Column(db.String(255), nullable=False)
+    people_vaccinated_per_hundred = db.Column(db.String(255), nullable=False)
+    people_fully_vaccinated_per_hundred = db.Column(db.String(255), nullable=False)
+    new_vaccinations_smoothed_per_million = db.Column(db.String(255), nullable=False)
+    stringency_index = db.Column(db.String(255), nullable=False)
+    population = db.Column(db.String(255), nullable=False)
+    population_density = db.Column(db.String(255), nullable=False)
+    median_age = db.Column(db.String(255), nullable=False)
+    aged_65_older = db.Column(db.String(255), nullable=False)
+    aged_70_older = db.Column(db.String(255), nullable=False)
+    gdp_per_capita = db.Column(db.String(255), nullable=False)
+    extreme_poverty = db.Column(db.String(255), nullable=False)
+    cardiovasc_death_rate = db.Column(db.String(255), nullable=False)
+    diabetes_prevalence = db.Column(db.String(255), nullable=False)
+    female_smokers = db.Column(db.String(255), nullable=False)
+    male_smokers = db.Column(db.String(255), nullable=False)
+    handwashing_facilities = db.Column(db.String(255), nullable=False)
+    hospital_beds_per_thousand = db.Column(db.String(255), nullable=False)
+    life_expectancy = db.Column(db.String(255), nullable=False)
+    human_development_index = db.Column(db.String(255), nullable=False)
diff --git a/src/flask_covid19/blueprints/data_rki/rki_model.py b/src/flask_covid19/blueprints/data_rki/rki_model.py
index a52c12396971d2cc71993e209edd7809a4b80092..0f9ef595283b729484b8e16698c79a44a08ee3b2 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_model.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_model.py
@@ -23,22 +23,23 @@ class RkiMeldedatum(BlueprintDateReported):
                                    self.date_reported_import_str, self.datum.isoformat(), self.year_day_of_year)
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
     date_reported_import_str = db.Column(db.String(255), nullable=False, unique=True)
     datum = db.Column(db.Date, nullable=False, unique=True)
+    #
     year_day_of_year = db.Column(db.String(255), nullable=False, unique=True)
-    year_month = db.Column(db.String(255), nullable=False, index=True)
-    year_week = db.Column(db.String(255), nullable=False, index=True)
     #
-    year = db.Column(db.Integer, nullable=False, index=True)
-    month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_week = db.Column(db.Integer, nullable=False, index=True)
-    day_of_year = db.Column(db.Integer, nullable=True)
-    week_of_year = db.Column(db.Integer, nullable=False, index=True)
+    year_month = db.Column(db.String(255), nullable=False)
+    year_week = db.Column(db.String(255), nullable=False)
     #
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    year = db.Column(db.Integer, nullable=False)
+    month = db.Column(db.Integer, nullable=False)
+    day_of_month = db.Column(db.Integer, nullable=False)
+    day_of_week = db.Column(db.Integer, nullable=False)
+    day_of_year = db.Column(db.Integer, nullable=True)
+    week_of_year = db.Column(db.Integer, nullable=False)
 
     @classmethod
     def remove_all(cls):
@@ -68,22 +69,23 @@ class RkiDatenstand(BlueprintDateReported):
                                    self.date_reported_import_str, self.datum.isoformat(), self.year_day_of_year)
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
     date_reported_import_str = db.Column(db.String(255), nullable=False, unique=True)
     datum = db.Column(db.Date, nullable=False, unique=True)
+    #
     year_day_of_year = db.Column(db.String(255), nullable=False, unique=True)
-    year_month = db.Column(db.String(255), nullable=False, index=True)
-    year_week = db.Column(db.String(255), nullable=False, index=True)
     #
-    year = db.Column(db.Integer, nullable=False, index=True)
-    month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_week = db.Column(db.Integer, nullable=False, index=True)
-    day_of_year = db.Column(db.Integer, nullable=True)
-    week_of_year = db.Column(db.Integer, nullable=False, index=True)
+    year_month = db.Column(db.String(255), nullable=False)
+    year_week = db.Column(db.String(255), nullable=False)
     #
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    year = db.Column(db.Integer, nullable=False)
+    month = db.Column(db.Integer, nullable=False)
+    day_of_month = db.Column(db.Integer, nullable=False)
+    day_of_week = db.Column(db.Integer, nullable=False)
+    day_of_year = db.Column(db.Integer, nullable=True)
+    week_of_year = db.Column(db.Integer, nullable=False)
 
 
 class RkiRefDatum(BlueprintDateReported):
@@ -103,29 +105,34 @@ class RkiRefDatum(BlueprintDateReported):
                                    self.date_reported_import_str, self.datum.isoformat(), self.year_day_of_year)
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
     date_reported_import_str = db.Column(db.String(255), nullable=False, unique=True)
     datum = db.Column(db.Date, nullable=False, unique=True)
+    #
     year_day_of_year = db.Column(db.String(255), nullable=False, unique=True)
-    year_month = db.Column(db.String(255), nullable=False, index=True)
-    year_week = db.Column(db.String(255), nullable=False, index=True)
     #
-    year = db.Column(db.Integer, nullable=False, index=True)
-    month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_week = db.Column(db.Integer, nullable=False, index=True)
-    day_of_year = db.Column(db.Integer, nullable=True)
-    week_of_year = db.Column(db.Integer, nullable=False, index=True)
+    year_month = db.Column(db.String(255), nullable=False)
+    year_week = db.Column(db.String(255), nullable=False)
     #
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    year = db.Column(db.Integer, nullable=False)
+    month = db.Column(db.Integer, nullable=False)
+    day_of_month = db.Column(db.Integer, nullable=False)
+    day_of_week = db.Column(db.Integer, nullable=False)
+    day_of_year = db.Column(db.Integer, nullable=True)
+    week_of_year = db.Column(db.Integer, nullable=False)
 
 
 class RkiBundesland(BlueprintLocationGroup):
     __tablename__ = 'rki_landkreis_bundesland'
     __mapper_args__ = {'concrete': True}
     __table_args__ = (
-        db.UniqueConstraint('id_bundesland', 'location_group', name="uix_rki_landkreis_bundesland"),
+        db.UniqueConstraint(
+            'id_bundesland',
+            'location_group',
+            name="uix_rki_landkreis_bundesland"
+        ),
     )
 
     def __repr__(self):
@@ -135,17 +142,23 @@ class RkiBundesland(BlueprintLocationGroup):
         return " " + self.location_group + " "
 
     id = db.Column(db.Integer, primary_key=True)
-    id_bundesland = db.Column(db.String(255), nullable=False, index=True)
-    location_group = db.Column(db.String(255), nullable=False, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
+    location_group = db.Column(db.String(255), nullable=False, unique=True)
+    id_bundesland = db.Column(db.String(255), nullable=False, unique=True)
 
 
 class RkiLandkreis(BlueprintLocation):
     __tablename__ = 'rki_landkreis'
     __mapper_args__ = {'concrete': True}
     __table_args__ = (
-        db.UniqueConstraint('location', 'id_landkreis', name="uix_rki_landkreis"),
+        db.UniqueConstraint(
+            'location',
+            'location_type',
+            'id_landkreis',
+            name="uix_rki_landkreis"
+        ),
     )
 
     def __repr__(self):
@@ -155,17 +168,18 @@ class RkiLandkreis(BlueprintLocation):
         return " " + str(self.location_group) + " : " + self.location + " ( " + self.id_landkreis + " ) "
 
     id = db.Column(db.Integer, primary_key=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
     location = db.Column(db.String(255), nullable=False, index=True)
-    location_group_id = db.Column(db.Integer, db.ForeignKey('rki_landkreis_bundesland.id'), nullable=False, index=True)
+    location_type = db.Column(db.String(255), nullable=False)
+    location_group_id = db.Column(db.Integer, db.ForeignKey('rki_landkreis_bundesland.id'), nullable=False)
     location_group = db.relationship(
         'RkiBundesland',
         lazy='joined',
         cascade='save-update',
         order_by='RkiBundesland.location_group')
-    id_landkreis = db.Column(db.String(255), nullable=False, index=True)
-    location_type = db.Column(db.String(255), nullable=False, index=True)
+    id_landkreis = db.Column(db.String(255), nullable=False)
 
     @classmethod
     @cache.memoize(50)
@@ -216,8 +230,9 @@ class RkiAltersgruppe(BlueprintEntity):
         return " " + self.altersgruppe + " "
 
     id = db.Column(db.Integer, primary_key=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
     altersgruppe = db.Column(db.String(255), nullable=False, unique=True)
 
     @classmethod
@@ -261,55 +276,55 @@ class RkiData(BlueprintFactTable):
                                              self.ref_datum_id, self.altersgruppe_id)
 
     id = db.Column(db.Integer, primary_key=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
-    date_reported_id = db.Column(db.Integer, db.ForeignKey('rki_date_reported.id'), nullable=False, index=True)
+    date_reported_id = db.Column(db.Integer, db.ForeignKey('rki_date_reported.id'), nullable=False)
     date_reported = db.relationship(
         'RkiMeldedatum',
         lazy='joined',
         cascade='save-update',
         order_by='desc(RkiMeldedatum.datum)')
-    location_id = db.Column(db.Integer, db.ForeignKey('rki_landkreis.id'), nullable=False, index=True)
+    location_id = db.Column(db.Integer, db.ForeignKey('rki_landkreis.id'), nullable=False)
     location = db.relationship(
         'RkiLandkreis',
         lazy='joined',
         cascade='save-update',
         order_by='asc(RkiLandkreis.location)')
     #
-    fid = db.Column(db.String(255), nullable=False, index=True)
-    # altersgruppe = db.Column(db.String(255), nullable=False, index=True)
-    altersgruppe_id = db.Column(db.Integer, db.ForeignKey('rki_altersgruppe.id'), nullable=False, index=True)
+    fid = db.Column(db.String(255), nullable=False, unique=True)
+    # altersgruppe = db.Column(db.String(255), nullable=False)
+    altersgruppe_id = db.Column(db.Integer, db.ForeignKey('rki_altersgruppe.id'), nullable=False)
     altersgruppe = db.relationship(
         'RkiAltersgruppe',
         lazy='joined',
         cascade='save-update',
         order_by='desc(RkiAltersgruppe.altersgruppe)')
-    # neuer_fall = db.Column(db.String(255), nullable=False, index=True)
-    geschlecht = db.Column(db.String(255), nullable=False, index=True)
-    anzahl_fall = db.Column(db.String(255), nullable=False, index=True)
-    anzahl_todesfall = db.Column(db.String(255), nullable=False, index=True)
-    # meldedatum = db.Column(db.String(255), nullable=False, index=True)
-    # datenstand = db.Column(db.String(255), nullable=False, index=True)
-    datenstand_id = db.Column(db.Integer, db.ForeignKey('rki_date_datenstand.id'), nullable=False, index=True)
+    # neuer_fall = db.Column(db.String(255), nullable=False)
+    geschlecht = db.Column(db.String(255), nullable=False)
+    anzahl_fall = db.Column(db.String(255), nullable=False)
+    anzahl_todesfall = db.Column(db.String(255), nullable=False)
+    # meldedatum = db.Column(db.String(255), nullable=False)
+    # datenstand = db.Column(db.String(255), nullable=False)
+    datenstand_id = db.Column(db.Integer, db.ForeignKey('rki_date_datenstand.id'), nullable=False)
     datenstand = db.relationship(
         'RkiDatenstand',
         lazy='joined',
         cascade='save-update',
         order_by='desc(RkiDatenstand.datum)')
-    neuer_fall = db.Column(db.String(255), nullable=False, index=True)
-    neuer_todesfall = db.Column(db.String(255), nullable=False, index=True)
-    # ref_datum = db.Column(db.String(255), nullable=False, index=True)
-    ref_datum_id = db.Column(db.Integer, db.ForeignKey('rki_date_ref_datum.id'), nullable=False, index=True)
+    neuer_fall = db.Column(db.String(255), nullable=False)
+    neuer_todesfall = db.Column(db.String(255), nullable=False)
+    # ref_datum = db.Column(db.String(255), nullable=False)
+    ref_datum_id = db.Column(db.Integer, db.ForeignKey('rki_date_ref_datum.id'), nullable=False)
     ref_datum = db.relationship(
         'RkiRefDatum',
         lazy='joined',
         cascade='save-update',
         order_by='desc(RkiRefDatum.datum)')
-    neu_genesen = db.Column(db.String(255), nullable=False, index=True)
-    anzahl_genesen = db.Column(db.String(255), nullable=False, index=True)
-    ist_erkrankungsbeginn = db.Column(db.String(255), nullable=False, index=True)
-    altersgruppe2 = db.Column(db.String(255), nullable=False, index=True)
+    neu_genesen = db.Column(db.String(255), nullable=False)
+    anzahl_genesen = db.Column(db.String(255), nullable=False)
+    ist_erkrankungsbeginn = db.Column(db.String(255), nullable=False)
+    altersgruppe2 = db.Column(db.String(255), nullable=False)
 
     @classmethod
     def delete_all(cls):
diff --git a/src/flask_covid19/blueprints/data_rki/rki_model_import.py b/src/flask_covid19/blueprints/data_rki/rki_model_import.py
index d90b0b159da33e88c54ec6a9fcdc1a77f6579941..a82ec8c11c3ae4181a9369c48b632de7c678ad48 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_model_import.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_model_import.py
@@ -10,35 +10,33 @@ class RkiImport(AllImport):
     __mapper_args__ = {'concrete': True}
 
     def __repr__(self):
-        return "%s(%s %s %s %s %s %s %s %s %s)" % (self.__class__.__name__,
-                                                   self.fid, self.geschlecht, self.date_reported_import_str,
-                                                   self.datum.isoformat(), self.datenstand_id, self.bundesland,
-                                                   self.landkreis, self.ref_datum_id, self.altersgruppe)
+        return "%s(%s)" % (self.__class__.__name__, self.fid)
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
     date_reported_import_str = db.Column(db.String(255), nullable=False, index=True)
     datum = db.Column(db.Date, nullable=False, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
     #
     fid = db.Column(db.String(255), nullable=False, index=True)
-    id_bundesland = db.Column(db.String(255), nullable=False, index=True)
+    id_bundesland = db.Column(db.String(255), nullable=False)
     bundesland = db.Column(db.String(255), nullable=False, index=True)
     landkreis = db.Column(db.String(255), nullable=False, index=True)
     altersgruppe = db.Column(db.String(255), nullable=False, index=True)
     geschlecht = db.Column(db.String(255), nullable=False, index=True)
-    anzahl_fall = db.Column(db.String(255), nullable=False, index=True)
-    anzahl_todesfall = db.Column(db.String(255), nullable=False, index=True)
-    meldedatum = db.Column(db.String(255), nullable=False, index=True)
-    id_landkreis = db.Column(db.String(255), nullable=False, index=True)
-    datenstand = db.Column(db.String(255), nullable=False, index=True)
-    neuer_fall = db.Column(db.String(255), nullable=False, index=True)
-    neuer_todesfall = db.Column(db.String(255), nullable=False, index=True)
-    ref_datum = db.Column(db.String(255), nullable=False, index=True)
-    neu_genesen = db.Column(db.String(255), nullable=False, index=True)
-    anzahl_genesen = db.Column(db.String(255), nullable=False, index=True)
-    ist_erkrankungsbeginn = db.Column(db.String(255), nullable=False, index=True)
-    altersgruppe2 = db.Column(db.String(255), nullable=False, index=True)
+    anzahl_fall = db.Column(db.String(255), nullable=False)
+    anzahl_todesfall = db.Column(db.String(255), nullable=False)
+    meldedatum = db.Column(db.String(255), nullable=False)
+    id_landkreis = db.Column(db.String(255), nullable=False)
+    datenstand = db.Column(db.String(255), nullable=False)
+    neuer_fall = db.Column(db.String(255), nullable=False)
+    neuer_todesfall = db.Column(db.String(255), nullable=False)
+    ref_datum = db.Column(db.String(255), nullable=False)
+    neu_genesen = db.Column(db.String(255), nullable=False)
+    anzahl_genesen = db.Column(db.String(255), nullable=False)
+    ist_erkrankungsbeginn = db.Column(db.String(255), nullable=False)
+    altersgruppe2 = db.Column(db.String(255), nullable=False)
 
     @classmethod
     def remove_all(cls):
@@ -173,40 +171,40 @@ class RkiFlat(AllFlat):
     date_reported_import_str = db.Column(db.String(255), nullable=False, index=True)
     datum = db.Column(db.Date, nullable=False, index=True)
     #
-    year = db.Column(db.Integer, nullable=False, index=True)
-    year_month = db.Column(db.String(255), nullable=False, index=True)
-    year_week = db.Column(db.String(255), nullable=False, index=True)
-    year_day_of_year = db.Column(db.String(255), nullable=False, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    year = db.Column(db.Integer, nullable=False)
+    year_month = db.Column(db.String(255), nullable=False)
+    year_week = db.Column(db.String(255), nullable=False)
+    year_day_of_year = db.Column(db.String(255), nullable=False)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
-    month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_week = db.Column(db.Integer, nullable=False, index=True)
-    week_of_year = db.Column(db.Integer, nullable=False, index=True)
-    day_of_year = db.Column(db.Integer, nullable=False, index=True)
+    month = db.Column(db.Integer, nullable=False)
+    day_of_month = db.Column(db.Integer, nullable=False)
+    day_of_week = db.Column(db.Integer, nullable=False)
+    week_of_year = db.Column(db.Integer, nullable=False)
+    day_of_year = db.Column(db.Integer, nullable=False)
     location = db.Column(db.String(255), nullable=False, index=True)
     location_group = db.Column(db.String(255), nullable=False, index=True)
-    location_code = db.Column(db.String(255), nullable=False, index=True)
+    location_code = db.Column(db.String(255), nullable=False)
     #
     fid = db.Column(db.String(255), nullable=False, index=True)
-    id_bundesland = db.Column(db.String(255), nullable=False, index=True)
+    id_bundesland = db.Column(db.String(255), nullable=False)
     bundesland = db.Column(db.String(255), nullable=False, index=True)
     landkreis = db.Column(db.String(255), nullable=False, index=True)
     altersgruppe = db.Column(db.String(255), nullable=False, index=True)
     geschlecht = db.Column(db.String(255), nullable=False, index=True)
-    anzahl_fall = db.Column(db.String(255), nullable=False, index=True)
-    anzahl_todesfall = db.Column(db.String(255), nullable=False, index=True)
-    meldedatum = db.Column(db.String(255), nullable=False, index=True)
-    id_landkreis = db.Column(db.String(255), nullable=False, index=True)
-    datenstand = db.Column(db.String(255), nullable=False, index=True)
-    neuer_fall = db.Column(db.String(255), nullable=False, index=True)
-    neuer_todesfall = db.Column(db.String(255), nullable=False, index=True)
-    ref_datum = db.Column(db.String(255), nullable=False, index=True)
-    neu_genesen = db.Column(db.String(255), nullable=False, index=True)
-    anzahl_genesen = db.Column(db.String(255), nullable=False, index=True)
-    ist_erkrankungsbeginn = db.Column(db.String(255), nullable=False, index=True)
-    altersgruppe2 = db.Column(db.String(255), nullable=False, index=True)
+    anzahl_fall = db.Column(db.String(255), nullable=False)
+    anzahl_todesfall = db.Column(db.String(255), nullable=False)
+    meldedatum = db.Column(db.String(255), nullable=False)
+    id_landkreis = db.Column(db.String(255), nullable=False)
+    datenstand = db.Column(db.String(255), nullable=False)
+    neuer_fall = db.Column(db.String(255), nullable=False)
+    neuer_todesfall = db.Column(db.String(255), nullable=False)
+    ref_datum = db.Column(db.String(255), nullable=False)
+    neu_genesen = db.Column(db.String(255), nullable=False)
+    anzahl_genesen = db.Column(db.String(255), nullable=False)
+    ist_erkrankungsbeginn = db.Column(db.String(255), nullable=False)
+    altersgruppe2 = db.Column(db.String(255), nullable=False)
 
     @classmethod
     def remove_all(cls):
diff --git a/src/flask_covid19/blueprints/data_who/who_model.py b/src/flask_covid19/blueprints/data_who/who_model.py
index 88437deaa12a57616b31a609d9f9cfa15044de84..2fff6db7715db6605b0979023d6c5bc44e007f2e 100644
--- a/src/flask_covid19/blueprints/data_who/who_model.py
+++ b/src/flask_covid19/blueprints/data_who/who_model.py
@@ -25,19 +25,23 @@ class WhoDateReported(BlueprintDateReported):
         return self.datum.isoformat()
 
     id = db.Column(db.Integer, primary_key=True)
-    year_month = db.Column(db.String(255), nullable=False, index=True)
-    year_week = db.Column(db.String(255), nullable=False, index=True)
-    year_day_of_year = db.Column(db.String(255), nullable=False, unique=True, index=True)
-    date_reported_import_str = db.Column(db.String(255), nullable=False, unique=True, index=True)
-    datum = db.Column(db.Date, nullable=False, unique=True, index=True)
-    year = db.Column(db.Integer, nullable=False, index=True)
-    month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_week = db.Column(db.Integer, nullable=False, index=True)
-    week_of_year = db.Column(db.Integer, nullable=False, index=True)
-    day_of_year = db.Column(db.Integer, nullable=True, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
+    #
+    date_reported_import_str = db.Column(db.String(255), nullable=False, unique=True)
+    datum = db.Column(db.Date, nullable=False, unique=True)
+    #
+    year_day_of_year = db.Column(db.String(255), nullable=False, unique=True)
+    #
+    year_month = db.Column(db.String(255), nullable=False)
+    year_week = db.Column(db.String(255), nullable=False)
+    #
+    year = db.Column(db.Integer, nullable=False)
+    month = db.Column(db.Integer, nullable=False)
+    day_of_month = db.Column(db.Integer, nullable=False)
+    day_of_week = db.Column(db.Integer, nullable=False)
+    day_of_year = db.Column(db.Integer, nullable=True)
+    week_of_year = db.Column(db.Integer, nullable=False)
 
 
 class WhoCountryRegion(BlueprintLocationGroup):
@@ -54,9 +58,9 @@ class WhoCountryRegion(BlueprintLocationGroup):
         return " " + self.location_group + " "
 
     id = db.Column(db.Integer, primary_key=True)
-    location_group = db.Column(db.String(255), nullable=False, unique=True, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    location_group = db.Column(db.String(255), nullable=False, unique=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
 
 
 class WhoCountry(BlueprintLocation):
@@ -73,16 +77,16 @@ class WhoCountry(BlueprintLocation):
         return self.location_group.__str__() + " : " + self.location_code + " | " + self.location
 
     id = db.Column(db.Integer, primary_key=True)
-    location_code = db.Column(db.String(255), unique=True, nullable=False, index=True)
-    location = db.Column(db.String(255), unique=True, nullable=False, index=True)
+    location_code = db.Column(db.String(255), unique=True, nullable=False)
+    location = db.Column(db.String(255), unique=True, nullable=False)
     location_group_id = db.Column(db.Integer, db.ForeignKey('who_country_region.id'), nullable=False)
     location_group = db.relationship(
         'WhoCountryRegion',
         lazy='joined',
         cascade='save-update',
         order_by='WhoCountryRegion.location_group')
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
 
     @classmethod
     @cache.memoize(50)
@@ -165,13 +169,13 @@ class WhoData(BlueprintFactTable):
         lazy='joined',
         cascade='save-update',
         order_by='asc(WhoCountry.location)')
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
-    cases_new = db.Column(db.Integer, nullable=False, index=True)
-    cases_cumulative = db.Column(db.Integer, nullable=False, index=True)
-    deaths_new = db.Column(db.Integer, nullable=False, index=True)
-    deaths_cumulative = db.Column(db.Integer, nullable=False, index=True)
+    cases_new = db.Column(db.Integer, nullable=False)
+    cases_cumulative = db.Column(db.Integer, nullable=False)
+    deaths_new = db.Column(db.Integer, nullable=False)
+    deaths_cumulative = db.Column(db.Integer, nullable=False)
 
     @classmethod
     def delete_by_datum(cls, datum: WhoDateReported):
diff --git a/src/flask_covid19/blueprints/data_who/who_model_import.py b/src/flask_covid19/blueprints/data_who/who_model_import.py
index 1acfdfa7206fa0582e84cb81f1fd0a1d6f69256b..a1cbcaae85186f6aabdc386bd406af385fe4107c 100644
--- a/src/flask_covid19/blueprints/data_who/who_model_import.py
+++ b/src/flask_covid19/blueprints/data_who/who_model_import.py
@@ -16,18 +16,18 @@ class WhoImport(AllImport):
         return self.datum.isoformat() + " " + self.country_code + " " + self.country + " " + str(self.row_imported)
 
     id = db.Column(db.Integer, primary_key=True)
-    datum = db.Column(db.Date, nullable=False, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    datum = db.Column(db.Date, nullable=False)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
-    new_cases = db.Column(db.String(255), nullable=False, index=True)
-    cumulative_cases = db.Column(db.String(255), nullable=False, index=True)
-    new_deaths = db.Column(db.String(255), nullable=False, index=True)
-    cumulative_deaths = db.Column(db.String(255), nullable=False, index=True)
-    country_code = db.Column(db.String(255), nullable=False, index=True)
-    country = db.Column(db.String(255), nullable=False, index=True)
-    who_region = db.Column(db.String(255), nullable=False, index=True)
-    date_reported = db.Column(db.String(255), nullable=False, index=True)
+    new_cases = db.Column(db.String(255), nullable=False)
+    cumulative_cases = db.Column(db.String(255), nullable=False)
+    new_deaths = db.Column(db.String(255), nullable=False)
+    cumulative_deaths = db.Column(db.String(255), nullable=False)
+    country_code = db.Column(db.String(255), nullable=False)
+    country = db.Column(db.String(255), nullable=False)
+    who_region = db.Column(db.String(255), nullable=False)
+    date_reported = db.Column(db.String(255), nullable=False)
 
     @classmethod
     @cache.cached(timeout=50)
@@ -172,31 +172,31 @@ class WhoFlat(AllFlat):
         return self.datum.isoformat() + " " + self.location_code + " " + self.location + " " + str(self.location_group)
 
     id = db.Column(db.Integer, primary_key=True)
+    processed_update = db.Column(db.Boolean, nullable=False)
+    processed_full_update = db.Column(db.Boolean, nullable=False)
     #
     date_reported_import_str = db.Column(db.String(255), nullable=False, index=True)
     datum = db.Column(db.Date, nullable=False, index=True)
     #
-    year = db.Column(db.Integer, nullable=False, index=True)
-    year_month = db.Column(db.String(255), nullable=False, index=True)
-    year_week = db.Column(db.String(255), nullable=False, index=True)
-    year_day_of_year = db.Column(db.String(255), nullable=False, index=True)
-    processed_update = db.Column(db.Boolean, nullable=False, index=True)
-    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    year = db.Column(db.Integer, nullable=False)
+    year_month = db.Column(db.String(255), nullable=False)
+    year_week = db.Column(db.String(255), nullable=False)
+    year_day_of_year = db.Column(db.String(255), nullable=False)
     #
-    month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_month = db.Column(db.Integer, nullable=False, index=True)
-    day_of_week = db.Column(db.Integer, nullable=False, index=True)
-    week_of_year = db.Column(db.Integer, nullable=False, index=True)
-    day_of_year = db.Column(db.Integer, nullable=False, index=True)
+    month = db.Column(db.Integer, nullable=False)
+    day_of_month = db.Column(db.Integer, nullable=False)
+    day_of_week = db.Column(db.Integer, nullable=False)
+    week_of_year = db.Column(db.Integer, nullable=False)
+    day_of_year = db.Column(db.Integer, nullable=False)
     location = db.Column(db.String(255), nullable=False, index=True)
     location_group = db.Column(db.String(255), nullable=False, index=True)
-    location_code = db.Column(db.String(255), nullable=False, index=True)
+    location_code = db.Column(db.String(255), nullable=False)
     #
-    new_cases = db.Column(db.Integer, nullable=False, index=True)
-    cumulative_cases = db.Column(db.Integer, nullable=False, index=True)
-    new_deaths = db.Column(db.Integer, nullable=False, index=True)
-    cumulative_deaths = db.Column(db.Integer, nullable=False, index=True)
-    country_code = db.Column(db.String(255), nullable=False, index=True)
-    country = db.Column(db.String(255), nullable=False, index=True)
-    who_region = db.Column(db.String(255), nullable=False, index=True)
-    date_reported = db.Column(db.String(255), nullable=False, index=True)
+    new_cases = db.Column(db.Integer, nullable=False)
+    cumulative_cases = db.Column(db.Integer, nullable=False)
+    new_deaths = db.Column(db.Integer, nullable=False)
+    cumulative_deaths = db.Column(db.Integer, nullable=False)
+    country_code = db.Column(db.String(255), nullable=False)
+    country = db.Column(db.String(255), nullable=False)
+    who_region = db.Column(db.String(255), nullable=False)
+    date_reported = db.Column(db.String(255), nullable=False)