diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py
index f863d065efc3c895aeb5213e68fab893e04a1e57..856d5aa05ca858831defc52a94363b683c0e11a5 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py
@@ -25,21 +25,21 @@ class EcdcDateReported(BlueprintDateReported):
 
     id = db.Column(db.Integer, primary_key=True)
     #
-    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)
+    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)
     #
-    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)
+    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)
     #
-    processed_update = db.Column(db.Boolean, nullable=False)
-    processed_full_update = db.Column(db.Boolean, nullable=False)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
 
     @classmethod
     @cache.memoize(50)
@@ -60,9 +60,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)
-    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, index=True)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
 
 
 class EcdcCountry(BlueprintLocation):
@@ -94,19 +94,19 @@ class EcdcCountry(BlueprintLocation):
 
     id = db.Column(db.Integer, primary_key=True)
     # country_territory_code = db.Column(db.String(255), nullable=False)
-    location_code = db.Column(db.String(255), nullable=True)
+    location_code = db.Column(db.String(255), nullable=True, index=True)
     # countries_and_territories = db.Column(db.String(255), nullable=False)
-    location = 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)
     location_group = db.relationship(
         'EcdcContinent',
         lazy='subquery', cascade="all, delete",
         order_by='asc(EcdcContinent.location_group)'
     )
-    processed_update = db.Column(db.Boolean, nullable=False)
-    processed_full_update = db.Column(db.Boolean, nullable=False)
-    pop_data_2019 = db.Column(db.String(255), nullable=False)
-    geo_id = 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)
+    pop_data_2019 = db.Column(db.String(255), nullable=False, index=True)
+    geo_id = db.Column(db.String(255), nullable=False, index=True)
 
     @classmethod
     def get_by(cls, location: str = '', geo_id: str = '', location_code: str = ''):
@@ -170,12 +170,12 @@ class EcdcData(BlueprintFactTable):
         lazy='joined',
         cascade='save-update',
         order_by='asc(EcdcCountry.location)')
-    processed_update = db.Column(db.Boolean, nullable=False)
-    processed_full_update = db.Column(db.Boolean, nullable=False)
+    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)
-    cases = db.Column(db.Integer, nullable=False)
-    cumulative_number_for_14_days_of_covid19_cases_per_100000 = db.Column(db.Float, nullable=False)
+    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)
 
     @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 88e7d432f037a3bf91da5a2ee5a2faa2ca293982..8d914dc13170f2e90460e94ebf0b568704fc0734 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,26 @@ class EcdcImport(AllImport):
                            self.continent_exp)
 
     id = db.Column(db.Integer, primary_key=True)
-    date_reported_import_str = db.Column(db.String(255), nullable=False)
-    datum = db.Column(db.Date, nullable=False)
-    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)
-    day = db.Column(db.String(255), nullable=False)
-    month = db.Column(db.String(255), nullable=False)
-    year = db.Column(db.String(255), nullable=False)
+    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)
     #
-    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)
+    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)
     #
-    countries_and_territories = db.Column(db.String(255), nullable=False)
-    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)
+    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)
+    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)
+    cumulative_number_for_14_days_of_covid19_cases_per_100000 = db.Column(db.String(255), nullable=False, index=True)
 
     @classmethod
     @cache.memoize(50)
@@ -155,29 +155,29 @@ class EcdcFlat(AllFlat):
                                     self.location_group.__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)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
     #
-    date_reported_import_str = db.Column(db.String(255), nullable=False)
-    datum = db.Column(db.Date, nullable=False)
-    location = db.Column(db.String(255), nullable=False)
-    location_group = db.Column(db.String(255), nullable=False)
-    location_code = db.Column(db.String(255), 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)
     #
-    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)
+    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)
     #
-    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)
+    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)
     #
-    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)
+    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)
 
diff --git a/src/flask_covid19/blueprints/data_owid/owid_model.py b/src/flask_covid19/blueprints/data_owid/owid_model.py
index 2a8f4bf223f5b5e6aa410f1d3d18b7b3f8a175a5..9b45038a1ae51f6f5a78468d9e3bb49359c15aef 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_model.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_model.py
@@ -27,18 +27,18 @@ class OwidDateReported(BlueprintDateReported):
     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_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)
-    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)
+    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)
+    week_of_year = db.Column(db.Integer, nullable=False, index=True)
     #
-    processed_update = db.Column(db.Boolean, nullable=False)
-    processed_full_update = db.Column(db.Boolean, nullable=False)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
 
 
 class OwidContinent(BlueprintLocationGroup):
@@ -57,8 +57,8 @@ class OwidContinent(BlueprintLocationGroup):
 
     id = db.Column(db.Integer, primary_key=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)
+    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 +79,32 @@ class OwidCountry(BlueprintLocation):
         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_id = db.Column(db.Integer, db.ForeignKey('owid_country_continent.id'), nullable=False)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    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)
-    location_code = db.Column(db.String(255), nullable=False)
-    location = 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)
+    # iso_code = db.Column(db.String(255), nullable=False, index=True)
+    location_code = db.Column(db.String(255), nullable=False, index=True)
+    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)
 
     @classmethod
     def delete_all_countries_for_continent(cls, owid_continent_one):
@@ -151,61 +151,61 @@ 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)
-    date_reported_id = db.Column(db.Integer, db.ForeignKey('owid_date_reported.id'), nullable=False)
+    date_reported_id = db.Column(db.Integer, db.ForeignKey('owid_date_reported.id'), nullable=False, index=True)
     date_reported = db.relationship(
         'OwidDateReported',
         lazy='joined',
         cascade='save-update',
         order_by='desc(OwidDateReported.datum)')
-    location_id = db.Column(db.Integer, db.ForeignKey('owid_country.id'), nullable=False)
+    location_id = db.Column(db.Integer, db.ForeignKey('owid_country.id'), nullable=False, index=True)
     location = db.relationship(
         'OwidCountry',
         lazy='joined',
         cascade='save-update',
         order_by='asc(OwidCountry.location)')
-    processed_update = db.Column(db.Boolean, nullable=False)
-    processed_full_update = db.Column(db.Boolean, nullable=False)
+    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)
-    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)
+    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)
 
     @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 edf4e431b1f4bd6ed77b667cd598ffa02d84c297..8f629551d57f6986d69fcf2b053de2d89b4fe76e 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,70 @@ class OwidImport(AllImport):
         return self.datum.isoformat() + " " + self.iso_code + " " + self.location + " " + str(self.continent)
 
     id = db.Column(db.Integer, primary_key=True)
-    date_reported_import_str = db.Column(db.String(255), nullable=False)
-    datum = db.Column(db.Date, nullable=False)
-    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)
-    continent = db.Column(db.String(255), nullable=False)
-    location = db.Column(db.String(255), nullable=False)
-    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)
+    iso_code = db.Column(db.String(255), nullable=False, index=True)
+    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)
 
     @classmethod
     def get_dates(cls):
@@ -274,77 +274,77 @@ class OwidFlat(AllFlat):
 
     id = db.Column(db.Integer, primary_key=True)
     #
-    date_reported_import_str = db.Column(db.String(255), nullable=False)
-    datum = db.Column(db.Date, 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)
-    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)
+    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)
     #
-    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)
-    location_group = db.Column(db.String(255), nullable=False)
-    location_code = 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)
+    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)
     #
-    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)
+    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)
diff --git a/src/flask_covid19/blueprints/data_rki/rki_model.py b/src/flask_covid19/blueprints/data_rki/rki_model.py
index 145cede6551829a5d69854693dd06de8af4fad58..a52c12396971d2cc71993e209edd7809a4b80092 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_model.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_model.py
@@ -27,18 +27,18 @@ class RkiMeldedatum(BlueprintDateReported):
     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_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)
-    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)
+    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)
+    week_of_year = db.Column(db.Integer, nullable=False, index=True)
     #
-    processed_update = db.Column(db.Boolean, nullable=False)
-    processed_full_update = db.Column(db.Boolean, nullable=False)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
 
     @classmethod
     def remove_all(cls):
@@ -72,18 +72,18 @@ class RkiDatenstand(BlueprintDateReported):
     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_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)
-    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)
+    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)
+    week_of_year = db.Column(db.Integer, nullable=False, index=True)
     #
-    processed_update = db.Column(db.Boolean, nullable=False)
-    processed_full_update = db.Column(db.Boolean, nullable=False)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
 
 
 class RkiRefDatum(BlueprintDateReported):
@@ -107,18 +107,18 @@ class RkiRefDatum(BlueprintDateReported):
     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_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)
-    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)
+    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)
+    week_of_year = db.Column(db.Integer, nullable=False, index=True)
     #
-    processed_update = db.Column(db.Boolean, nullable=False)
-    processed_full_update = db.Column(db.Boolean, nullable=False)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
 
 
 class RkiBundesland(BlueprintLocationGroup):
@@ -135,10 +135,10 @@ class RkiBundesland(BlueprintLocationGroup):
         return " " + self.location_group + " "
 
     id = db.Column(db.Integer, primary_key=True)
-    id_bundesland = db.Column(db.String(255), nullable=False)
-    location_group = db.Column(db.String(255), nullable=False)
-    processed_update = db.Column(db.Boolean, nullable=False)
-    processed_full_update = db.Column(db.Boolean, nullable=False)
+    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)
 
 
 class RkiLandkreis(BlueprintLocation):
@@ -155,17 +155,17 @@ 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)
-    processed_full_update = db.Column(db.Boolean, nullable=False)
-    location = db.Column(db.String(255), nullable=False)
-    location_group_id = db.Column(db.Integer, db.ForeignKey('rki_landkreis_bundesland.id'), nullable=False)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
+    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_group = db.relationship(
         'RkiBundesland',
         lazy='joined',
         cascade='save-update',
         order_by='RkiBundesland.location_group')
-    id_landkreis = db.Column(db.String(255), nullable=False)
-    location_type = db.Column(db.String(255), nullable=False)
+    id_landkreis = db.Column(db.String(255), nullable=False, index=True)
+    location_type = db.Column(db.String(255), nullable=False, index=True)
 
     @classmethod
     @cache.memoize(50)
@@ -216,8 +216,8 @@ class RkiAltersgruppe(BlueprintEntity):
         return " " + self.altersgruppe + " "
 
     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)
+    processed_update = db.Column(db.Boolean, nullable=False, index=True)
+    processed_full_update = db.Column(db.Boolean, nullable=False, index=True)
     altersgruppe = db.Column(db.String(255), nullable=False, unique=True)
 
     @classmethod
@@ -264,13 +264,13 @@ class RkiData(BlueprintFactTable):
     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('rki_date_reported.id'), nullable=False)
+    date_reported_id = db.Column(db.Integer, db.ForeignKey('rki_date_reported.id'), nullable=False, index=True)
     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)
+    location_id = db.Column(db.Integer, db.ForeignKey('rki_landkreis.id'), nullable=False, index=True)
     location = db.relationship(
         'RkiLandkreis',
         lazy='joined',
@@ -278,20 +278,20 @@ class RkiData(BlueprintFactTable):
         order_by='asc(RkiLandkreis.location)')
     #
     fid = db.Column(db.String(255), nullable=False, index=True)
-    # altersgruppe = db.Column(db.String(255), nullable=False)
-    altersgruppe_id = db.Column(db.Integer, db.ForeignKey('rki_altersgruppe.id'), nullable=False)
+    # 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)
     altersgruppe = db.relationship(
         'RkiAltersgruppe',
         lazy='joined',
         cascade='save-update',
         order_by='desc(RkiAltersgruppe.altersgruppe)')
-    # neuer_fall = db.Column(db.String(255), nullable=False)
+    # 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)
-    # datenstand = db.Column(db.String(255), nullable=False)
-    datenstand_id = db.Column(db.Integer, db.ForeignKey('rki_date_datenstand.id'), nullable=False)
+    # 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)
     datenstand = db.relationship(
         'RkiDatenstand',
         lazy='joined',
@@ -299,8 +299,8 @@ class RkiData(BlueprintFactTable):
         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)
-    ref_datum_id = db.Column(db.Integer, db.ForeignKey('rki_date_ref_datum.id'), nullable=False)
+    # 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)
     ref_datum = db.relationship(
         'RkiRefDatum',
         lazy='joined',
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 92a68a96064bb826ae5437c6798520fe14f31021..d90b0b159da33e88c54ec6a9fcdc1a77f6579941 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_model_import.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_model_import.py
@@ -16,29 +16,29 @@ class RkiImport(AllImport):
                                                    self.landkreis, self.ref_datum_id, self.altersgruppe)
 
     id = db.Column(db.Integer, primary_key=True)
-    date_reported_import_str = db.Column(db.String(255), nullable=False)
-    datum = db.Column(db.Date, nullable=False)
-    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)
-    id_bundesland = db.Column(db.String(255), nullable=False)
-    bundesland = db.Column(db.String(255), nullable=False)
-    landkreis = db.Column(db.String(255), nullable=False)
-    altersgruppe = 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)
-    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)
+    fid = db.Column(db.String(255), nullable=False, index=True)
+    id_bundesland = db.Column(db.String(255), nullable=False, index=True)
+    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)
 
     @classmethod
     def remove_all(cls):
@@ -170,43 +170,43 @@ class RkiFlat(AllFlat):
 
     id = db.Column(db.Integer, primary_key=True)
     #
-    date_reported_import_str = db.Column(db.String(255), nullable=False)
-    datum = db.Column(db.Date, 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)
-    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)
+    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)
     #
-    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)
-    location_group = db.Column(db.String(255), nullable=False)
-    location_code = 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)
+    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)
     #
-    fid = db.Column(db.String(255), nullable=False)
-    id_bundesland = db.Column(db.String(255), nullable=False)
-    bundesland = db.Column(db.String(255), nullable=False)
-    landkreis = db.Column(db.String(255), nullable=False)
-    altersgruppe = 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)
-    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)
+    fid = db.Column(db.String(255), nullable=False, index=True)
+    id_bundesland = db.Column(db.String(255), nullable=False, index=True)
+    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)
 
     @classmethod
     def remove_all(cls):