diff --git a/inst/default_options.csv b/inst/default_options.csv
index 4ed5afa..558394b 100644
--- a/inst/default_options.csv
+++ b/inst/default_options.csv
@@ -1,42 +1,41 @@
-iso3,area_scope,area_level,calendar_quarter_t2,calendar_quarter_t3,calendar_quarter_t1,survey_prevalence,survey_art_coverage,survey_recently_infected,use_survey_aggregate,include_art_t1,include_art_t2,artattend,artattend_t2,anc_clients_year2,anc_clients_year2_num_months,anc_prevalence_year1,anc_prevalence_year2,anc_art_coverage_year1,anc_art_coverage_year2,spectrum_population_calibration,output_aware_plhiv,max_iterations,no_of_samples,rng_seed,permissive,artattend_log_gamma_offset,use_kish_prev,deff_prev,use_kish_artcov,deff_artcov,use_kish_recent,deff_recent,spectrum_plhiv_calibration_level,spectrum_plhiv_calibration_strat,spectrum_artnum_calibration_level,spectrum_artnum_calibration_strat,spectrum_aware_calibration_level,spectrum_aware_calibration_strat,spectrum_infections_calibration_level,spectrum_infections_calibration_strat,calibrate_method,deff_vls,use_kish_vls,rho_paed_x_term,rho_paed_15to49f_ratio,alpha_xst_term,adjust_area_growth,anchor_home_district,calendar_quarter_t4,calendar_quarter_t5,psnu_level
-fallback,NA,NA,CY2024Q4,CY2025Q3,NA,NA,NA,NA,FALSE,,,,,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-AGO,AGO,1,CY2024Q4,CY2025Q3,CY2015Q4,AGO2015DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,CY2026Q3,CY2027Q3,1
-BDI,BDI,2,CY2024Q4,CY2025Q3,CY2016Q4,BDI2016DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-BEN,BEN,2,CY2024Q4,CY2025Q3,CY2012Q1,BEN2012DHS,,,TRUE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-BFA,BFA,2,CY2024Q4,CY2025Q3,CY2010Q3,BFA2010DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-BWA,BWA,3,CY2024Q4,CY2025Q3,CY2021Q1,BWA2021BAIS,BWA2021BAIS,,FALSE,,TRUE,TRUE,TRUE,2024,12,2019,2024,2019,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,3
-CAF,CAF,3,CY2024Q4,CY2025Q3,CY2010Q4,CAF2010MICS,,,TRUE,,TRUE,TRUE,TRUE,2024,12,2019,2024,2019,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-CIV,CIV,2,CY2024Q4,CY2025Q3,CY2017Q4,CIV2017PHIA,CIV2017PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2017,2024,2017,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-CMR,CMR,3,CY2024Q4,CY2025Q3,CY2017Q3,CMR2018DHS; CMR2017PHIA,CMR2017PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2018,2024,2018,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-COD,COD,3,CY2024Q4,CY2025Q3,CY2013Q4,COD2013DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,CY2026Q3,CY2027Q3,3
-COG,COG,2,CY2024Q4,CY2025Q3,CY2022Q3,COG2009AIS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2022,2024,2022,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-ERI,ERI,1,CY2024Q4,CY2025Q3,CY2010Q2,ERI2010PHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-ETH,ETH,2,CY2024Q4,CY2025Q3,CY2016Q1,ETH2016DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,2
-GAB,GAB,1,CY2024Q4,CY2025Q3,CY2020Q4,GAB2019DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-GHA,GHA,2,CY2024Q4,CY2025Q3,CY2014Q4,GHA2014DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,CY2026Q3,CY2027Q3,1
-GIN,GIN,2,CY2024Q4,CY2025Q3,CY2018Q2,GIN2018DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-GMB,GMB,2,CY2024Q4,CY2025Q3,CY2013Q1,GMB2013DHS,,,TRUE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-GNB,GNB,1,CY2024Q4,CY2025Q3,CY2010Q2,GNB2010MICS,,,TRUE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-HTI,HTI,2,CY2024Q4,CY2025Q3,CY2020Q1,HTI2019PHIA,HTI2019PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,CY2026Q3,CY2027Q3,1
-KEN,KEN,2,CY2024Q4,CY2025Q3,CY2018Q4,KEN2018PHIA,KEN2018PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2018,2024,2018,2024,subnational,FALSE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,2
-LBR,LBR,1,CY2024Q4,CY2025Q3,CY2013Q2,LBR2013DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-LSO,LSO,1,CY2024Q4,CY2025Q3,CY2020Q1,LSO2020PHIA,LSO2020PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-MLI,MLI,1,CY2024Q4,CY2025Q3,CY2013Q1,MLI2012DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-MOZ,MOZ,3,CY2024Q4,CY2025Q3,CY2021Q3,MOZ2021PHIA,MOZ2021PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,CY2026Q3,CY2027Q3,3
-MOZ,MOZ,3,CY2024Q4,CY2025Q3,CY2021Q3,MOZ2021PHIA,MOZ2021PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,CY2026Q3,CY2027Q3,
-MWI,MWI,5,CY2024Q4,CY2025Q3,CY2020Q3,MWI2020PHIA,MWI2020PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,3
-NAM,NAM,2,CY2024Q4,CY2025Q3,CY2017Q3,NAM2017PHIA,M2017PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2017,2024,2017,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-NER,NER,1,CY2024Q4,CY2025Q3,CY2012Q2,NER2012DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-NGA,NGA,2,CY2024Q4,CY2025Q3,CY2018Q4,NGA2018NAIS,NGA2018IS,,FALSE,,TRUE,TRUE,TRUE,2024,12,2018,2024,2018,2024,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,2
-RWA,RWA,2,CY2024Q4,CY2025Q3,CY2018Q4,RWA2018PHIA,RWA2018PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2018,2024,2018,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-SLE,SLE,2,CY2024Q4,CY2025Q3,CY2019Q2,SLE2019DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,2
-STP,STP,1,CY2024Q4,CY2025Q3,CY2014Q4,STP2014MICS,,,TRUE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-SWZ,SWZ,1,CY2024Q4,CY2025Q3,CY2021Q3,SWZ2021PHIA,SWZ2021PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-TCD,TCD,1,CY2024Q4,CY2025Q3,CY2015Q1,TCD2014DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
-TGO,TGO,2,CY2024Q4,CY2025Q3,CY2014Q1,TGO2013DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
-TZA,TZA,4,CY2024Q4,CY2025Q3,CY2022Q4,TZA2022PHIA,TZA2022PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,9,2022,2024,2022,2024,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,3
-UGA,UGA,3,CY2024Q4,CY2025Q3,CY2020Q4,UGA2020PHIA,UGA2020PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,TRUE,FALSE,TRUE,CY2026Q3,CY2027Q3,3
-XXX,XXX,2,CY2024Q4,CY2025Q3,CY2017Q4,CMR2018DHS; CMR2017PHIA,CIV2017PHIA,,invalid,,TRUE,TRUE,TRUE,2024,12,2017,2024,2017,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,invalid,TRUE,CY2026Q3,CY2027Q3,
-ZAF,ZAF,2,CY2024Q4,CY2025Q3,CY2017Q2,ZAF2017HSRC; ZAF2016DHS,ZAF2017HSRC,ZAF2017HSRC,FALSE,,TRUE,TRUE,TRUE,2024,12,2017,2024,2017,2024,subnational,TRUE,250,1000,17,TRUE,-4,TRUE,1,TRUE,1,FALSE,1,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,logistic,1,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,CY2026Q3,CY2027Q3,2
-ZMB,ZMB,2,CY2024Q4,CY2025Q3,CY2021Q3,ZMB2021PHIA,ZMB2021PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,2
-ZWE,ZWE,2,CY2024Q4,CY2025Q3,CY2020Q1,ZWE2020PHIA,ZWE2020PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
\ No newline at end of file
+iso3,area_scope,area_level,calendar_quarter_t2,calendar_quarter_t3,calendar_quarter_t1,survey_prevalence,survey_art_coverage,survey_recently_infected,use_survey_aggregate,include_art_t1,include_art_t2,artattend,artattend_t2,anc_clients_year2,anc_clients_year2_num_months,anc_prevalence_year1,anc_prevalence_year2,anc_art_coverage_year1,anc_art_coverage_year2,spectrum_population_calibration,output_aware_plhiv,max_iterations,no_of_samples,rng_seed,permissive,artattend_log_gamma_offset,use_kish_prev,deff_prev,use_kish_artcov,deff_artcov,use_kish_recent,deff_recent,spectrum_plhiv_calibration_level,spectrum_plhiv_calibration_strat,spectrum_artnum_calibration_level,spectrum_artnum_calibration_strat,spectrum_aware_calibration_level,spectrum_aware_calibration_strat,spectrum_infections_calibration_level,spectrum_infections_calibration_strat,calibrate_method,deff_vls,use_kish_vls,rho_paed_x_term,rho_paed_15to49f_ratio,alpha_xst_term,adjust_area_growth,anchor_home_district,calendar_quarter_t4,calendar_quarter_t5,psnu_level
+fallback,NA,NA,CY2024Q4,CY2025Q3,NA,NA,NA,NA,FALSE,,,,,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+AGO,AGO,1,CY2024Q4,CY2025Q3,CY2015Q4,AGO2015DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,CY2026Q3,CY2027Q3,1
+BDI,BDI,2,CY2024Q4,CY2025Q3,CY2016Q4,BDI2016DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+BEN,BEN,2,CY2024Q4,CY2025Q3,CY2012Q1,BEN2012DHS,,,TRUE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+BFA,BFA,2,CY2024Q4,CY2025Q3,CY2010Q3,BFA2010DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+BWA,BWA,3,CY2024Q4,CY2025Q3,CY2021Q1,BWA2021BAIS,BWA2021BAIS,,FALSE,,TRUE,TRUE,TRUE,2024,12,2019,2024,2019,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,3
+CAF,CAF,3,CY2024Q4,CY2025Q3,CY2010Q4,CAF2010MICS,,,TRUE,,TRUE,TRUE,TRUE,2024,12,2019,2024,2019,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+CIV,CIV,2,CY2024Q4,CY2025Q3,CY2017Q4,CIV2017PHIA,CIV2017PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2017,2024,2017,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+CMR,CMR,3,CY2024Q4,CY2025Q3,CY2017Q3,CMR2018DHS; CMR2017PHIA,CMR2017PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2018,2024,2018,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+COD,COD,3,CY2024Q4,CY2025Q3,CY2013Q4,COD2013DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,CY2026Q3,CY2027Q3,3
+COG,COG,2,CY2024Q4,CY2025Q3,CY2022Q3,COG2009AIS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2022,2024,2022,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+ERI,ERI,1,CY2024Q4,CY2025Q3,CY2010Q2,ERI2010PHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+ETH,ETH,2,CY2024Q4,CY2025Q3,CY2016Q1,ETH2016DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,2
+GAB,GAB,1,CY2024Q4,CY2025Q3,CY2020Q4,GAB2019DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+GHA,GHA,2,CY2024Q4,CY2025Q3,CY2014Q4,GHA2014DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,CY2026Q3,CY2027Q3,1
+GIN,GIN,2,CY2024Q4,CY2025Q3,CY2018Q2,GIN2018DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+GMB,GMB,2,CY2024Q4,CY2025Q3,CY2013Q1,GMB2013DHS,,,TRUE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+GNB,GNB,1,CY2024Q4,CY2025Q3,CY2010Q2,GNB2010MICS,,,TRUE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+HTI,HTI,2,CY2024Q4,CY2025Q3,CY2020Q1,HTI2019PHIA,HTI2019PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,CY2026Q3,CY2027Q3,1
+KEN,KEN,2,CY2024Q4,CY2025Q3,CY2018Q4,KEN2018PHIA,KEN2018PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2018,2024,2018,2024,subnational,FALSE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,2
+LBR,LBR,1,CY2024Q4,CY2025Q3,CY2013Q2,LBR2013DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+LSO,LSO,1,CY2024Q4,CY2025Q3,CY2020Q1,LSO2020PHIA,LSO2020PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+MLI,MLI,1,CY2024Q4,CY2025Q3,CY2013Q1,MLI2012DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+MOZ,MOZ,3,CY2024Q4,CY2025Q3,CY2021Q3,MOZ2021PHIA,MOZ2021PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,CY2026Q3,CY2027Q3,3
+MWI,MWI,5,CY2024Q4,CY2025Q3,CY2020Q3,MWI2020PHIA,MWI2020PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,3
+NAM,NAM,2,CY2024Q4,CY2025Q3,CY2017Q3,NAM2017PHIA,M2017PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2017,2024,2017,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+NER,NER,1,CY2024Q4,CY2025Q3,CY2012Q2,NER2012DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+NGA,NGA,2,CY2024Q4,CY2025Q3,CY2018Q4,NGA2018NAIS,NGA2018IS,,FALSE,,TRUE,TRUE,TRUE,2024,12,2018,2024,2018,2024,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,2
+RWA,RWA,2,CY2024Q4,CY2025Q3,CY2018Q4,RWA2018PHIA,RWA2018PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2018,2024,2018,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+SLE,SLE,2,CY2024Q4,CY2025Q3,CY2019Q2,SLE2019DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,2
+STP,STP,1,CY2024Q4,CY2025Q3,CY2014Q4,STP2014MICS,,,TRUE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+SWZ,SWZ,1,CY2024Q4,CY2025Q3,CY2021Q3,SWZ2021PHIA,SWZ2021PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+TCD,TCD,1,CY2024Q4,CY2025Q3,CY2015Q1,TCD2014DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,
+TGO,TGO,2,CY2024Q4,CY2025Q3,CY2014Q1,TGO2013DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
+TZA,TZA,4,CY2024Q4,CY2025Q3,CY2022Q4,TZA2022PHIA,TZA2022PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,9,2022,2024,2022,2024,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,3
+UGA,UGA,3,CY2024Q4,CY2025Q3,CY2020Q4,UGA2020PHIA,UGA2020PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,TRUE,FALSE,TRUE,CY2026Q3,CY2027Q3,3
+XXX,XXX,2,CY2024Q4,CY2025Q3,CY2017Q4,CMR2018DHS; CMR2017PHIA,CIV2017PHIA,,invalid,,TRUE,TRUE,TRUE,2024,12,2017,2024,2017,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,invalid,TRUE,CY2026Q3,CY2027Q3,
+ZAF,ZAF,2,CY2024Q4,CY2025Q3,CY2017Q2,ZAF2017HSRC; ZAF2016DHS,ZAF2017HSRC,ZAF2017HSRC,FALSE,,TRUE,TRUE,TRUE,2024,12,2017,2024,2017,2024,subnational,TRUE,250,1000,17,TRUE,-4,TRUE,1,TRUE,1,FALSE,1,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,logistic,1,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,CY2026Q3,CY2027Q3,2
+ZMB,ZMB,2,CY2024Q4,CY2025Q3,CY2021Q3,ZMB2021PHIA,ZMB2021PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2021,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,2
+ZWE,ZWE,2,CY2024Q4,CY2025Q3,CY2020Q1,ZWE2020PHIA,ZWE2020PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,subnational,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
diff --git a/tests/testthat/test-options.R b/tests/testthat/test-options.R
index 54ad29c..9baa5fc 100644
--- a/tests/testthat/test-options.R
+++ b/tests/testthat/test-options.R
@@ -205,7 +205,7 @@ describe("when getting controls for unknown country", {
 
   it("has override defaults for non country specific options", {
     calendar_quarter_t2 <- get_control(out, "calendar_quarter_t2")
-    expect_equal(calendar_quarter_t2$value, "CY2023Q4")
+    expect_equal(calendar_quarter_t2$value, "CY2024Q4")
   })
 
   it("has no value for country specific options", {