diff --git a/iati_datastore/iatilib/codelists/1/AidType.csv b/iati_datastore/iatilib/codelists/1/AidType.csv
index 802ed053..db71100f 100644
--- a/iati_datastore/iatilib/codelists/1/AidType.csv
+++ b/iati_datastore/iatilib/codelists/1/AidType.csv
@@ -2,11 +2,13 @@ code,name,description,category,status
 A01,General budget support,"Unearmarked contributions to the government budget including funding to support the implementation of macroeconomic reforms (structural adjustment programmes, poverty reduction strategies). Budget support is a method of financing a recipient country’s budget through a transfer of resources from an external financing agency to the recipient government’s national treasury. The funds thus transferred are managed in accordance with the recipient’s budgetary procedures. Funds transferred to the national treasury for financing programmes or projects managed according to different budgetary procedures from those of the recipient country, with the intention of earmarking the resources for specific uses, are therefore excluded.",A,active
 A02,Sector budget support,"Sector budget support, like general budget support, is a financial contribution to a recipient government’s budget. However, in sector budget support, the dialogue between donors and partner governments focuses on sector-specific concerns, rather than on overall policy and budget priorities.",A,active
 B01,"Core support to NGOs, other private bodies, PPPs and research institutes","Funds are paid over to NGOs (local, national and international) for use at the latter’s discretion, and contribute to programmes and activities which NGOs have developed themselves, and which they implement on their own authority and responsibility. Core contributions to PPPs, funds paid over to foundations (e.g. philanthropic foundations), and contributions to research institutes (public and private) are also recorded here. Annex 2 of the DAC Directives provides a list of INGOs, PPPs and networks core contributions to which may be reported under B01. This list is not exclusive.",B,active
-B02,Core contributions to multilateral institutions,These funds are classified as multilateral ODA (all other categories fall under bilateral ODA). The recipient multilateral institution pools contributions so that they lose their identity and become an integral part of its financial assets. See Annex 2 of the DAC Directives for a comprehensive list of agencies core contributions to which may be reported under B02 (Section I. Multilateral institutions).,B,active
-B03,Contributions to specific-purpose programmes and funds managed by implementing partners,"In addition to their core-funded operations, international organisations, NGOs, PPPs and networks, both in provider and in third countries, set up programmes and funds with a specific sectoral, thematic or geographical focus. Donors’ bilateral contributions to such programmes and funds are recorded here.",B,active
-B031,Contributions to multi-donor/multi-entity funding mechanisms,"Funding mechanisms that pool contributions from several donors and that are implemented by several multilateral entities e.g. UN inter-agency pooled funds, including CERF and country-based pooled funds; Financial Intermediary Funds (GEF, CIFs) for which the World Bank is the Trustee.",B03,active
-B032,Contributions to multi-donor/single-entity funding mechanisms,Contributions to multi-donor funding mechanisms managed by a single multilateral organisation e.g. UN single-agency thematic funds; World Bank or other MDB trust funds. Classify the contribution as B032 even if in the initial stages only one donor contributes to the fund.,B03,active
-B033,Contributions to single-donor funding mechanisms and contributions earmarked for a specific funding window or geographical location,"Contributions to funding mechanisms where the donor has a significant influence on the allocation of funds. This includes contributions to single-donor trust funds and earmarked contributions to specific countries/geographical locations or funding windows within multi-donor trust funds. When the donor designs the activity but channels it through an international organisation, the activity should be classified as C01.",B03,active
+B02,Core contributions to multilateral institutions and global funds,"These funds are classified as multilateral (all other categories are bilateral). The recipient multilateral institution pools contributions so that they lose their identity and become an integral part of its financial assets or liabilities. Also includes Financial Intermediary Funds (GEF, CIFs) for which the World Bank is the Trustee, as well as some UN inter-agency pooled funds, such as CERF and the UN Peacebuilding Fund. See Annex 2 of the Reporting Directives for a comprehensive list of agencies, core contributions to which may be reported under B02 and its subcategories. (Section I. Multilateral institutions). Nota bene: contributions to multilateral development organisations beyond Annex 2 are not reportable in the DAC statistics. The non-ODA components of core support to multilateral organisations included in Annex 2 are not reportable either.",B,active
+B021,Core contributions to multilateral institutions,Contributions in this category are pooled by the recipient multilateral institution and become an integral part of its financial assets or liabilities.,B,active
+B022,Core contributions to global funds,"Contributions to global funds classified as multilateral including Financial Intermediary Funds for which the World Bank is the Trustee and which have gone through the Annex 2 process (GEF, CIFs) as well as some UN inter-agency pooled funds, e.g. CERF and the UN Peacebuilding Fund.",B,active
+B03,Contributions to specific-purpose programmes and funds managed by implementing partners,"In addition to their core-funded operations, international organisations – multilateral agencies, NGOs, PPPs or networks – both in provider and in third countries, set up programmes and funds with a specific sectoral, thematic or geographical focus. Donors’ bilateral contributions to such programmes and funds are recorded here. Use categories B031 and B032 for trust funds managed by the UN (all designed as multi-donor) unless contributions are earmarked for a specific geographical location or funding window.",B,active
+B031,Contributions to multi-donor/multi-entity funding mechanisms,"Contributions to funding mechanisms (specific-purpose programmes and funds) that pool resources from several providers and from which several international organisations – multilateral agencies, NGOs, PPPs or networks – may be allocated funds for implementation e.g. contributions to UN country-based pooled funds and country-level development funds. Excludes contributions to global funds classified as multilateral (see B022). Includes Financial Intermediary Funds for which the World Bank is the Trustee and which have not gone through the Annex 2 process.",B,active
+B032,Contributions to multi-donor/single-entity funding mechanisms,"Contributions to multi-donor funding mechanisms (specific-purpose programmes and funds) managed by a single international organisation – multilateral agency, NGO, PPP or network – e.g. UN single-agency thematic funds; World Bank or other MDB trust funds. Classify the contribution as B032 even if in the initial stages only one donor contributes to the fund.",B,active
+B033,Contributions to single-donor funding mechanisms and contributions earmarked for a specific funding window or geographical location,"Contributions to funding mechanisms (specific-purpose programmes and funds) where the donor has a significant influence on the allocation of funds. This includes contributions to single-donor trust funds and earmarked contributions to specific countries/geographical locations or funding windows within multi-donor trust funds. When the donor designs the activity but channels it through an international organisation, the activity should be classified as C01.",B,active
 B04,Basket funds/pooled funding,"The donor contributes funds to an autonomous account, managed jointly with other donors and/or the recipient. The account will have specific purposes, modes of disbursement and accountability mechanisms, and a limited time frame. Basket funds are characterised by common project documents, common funding contracts and common reporting/audit procedures with all donors. Donors’ contributions to funds managed autonomously by international organisations are recorded under B03.",B,active
 C01,Project-type interventions,"A project is a set of inputs, activities and outputs, agreed with the partner country*, to reach specific objectives/outcomes within a defined time frame, with a defined budget and a defined geographical area. Projects can vary significantly in terms of objectives, complexity, amounts involved and duration. There are smaller projects that might involve modest financial resources and last only a few months, whereas large projects might involve more significant amounts, entail successive phases and last for many years. A large project with a number of different components is sometimes referred to as a programme, but should nevertheless be recorded here. Feasibility studies, appraisals and evaluations are included (whether designed as part of projects/programmes or dedicated funding arrangements). Academic studies, research and development, trainings, scholarships, and other technical assistance activities not directly linked to development projects/programmes should instead be recorded under D02. Aid channelled through NGOs or multilaterals is also recorded here. This includes payments for NGOs and multilaterals to implement donors’ projects and programmes, and funding of specified NGOs projects. By contrast, core funding of NGOs and multilaterals as well as contributions to specific-purpose funds are recorded under B.* In the cases of equity investments, humanitarian aid or aid channelled through NGOs, projects are recorded here even if there was no direct agreement between the donor and the partner country. Contributions to single-donor trust funds and contributions to trust funds earmarked for a specific funding window and/or country are recorded under B033.",C,active
 D01,Donor country personnel,"Experts, consultants, teachers, academics, researchers, volunteers and contributions to public and private bodies for sending experts to developing countries.",D,active
diff --git a/iati_datastore/iatilib/codelists/1/FlowType.csv b/iati_datastore/iatilib/codelists/1/FlowType.csv
index a7f166df..c398375e 100644
--- a/iati_datastore/iatilib/codelists/1/FlowType.csv
+++ b/iati_datastore/iatilib/codelists/1/FlowType.csv
@@ -1,11 +1,11 @@
 code,name,description,status
 10,ODA,Official Development Assistance,active
 20,OOF,Other Official Flows,withdrawn
-21,Non-export credit OOF,"Other Official Flows, excl. export credits",active
-22,Officially supported export credits,Officially supported export credits. Covers both official direct export credits and private export credits under official guarantee or insurance,active
-30,Private Development Finance,"Financing by civil society organisations (NGOs, philantropic foundations, etc.)",active
+21,Non-export credit OOF,"Other Official Flows, excl. export credits.",active
+22,Officially supported export credits,Officially supported export credits. Covers both official direct export credits and private export credits under official guarantee or insurance.,active
+30,Private grants,made by NGOs and other civil society organisations (e.e. philantropic foundations) based in the reporting DAC country,active
 35,Private Market,Private long-term (i.e. over one-year maturity) capital transactions made by residents of DAC countries,withdrawn
-36,Private Foreign Direct Investment,Private Foreign Direct Investment,active
-37,Other Private flows at market terms,Private long-term (i.e. over one-year maturity) capital transactions made by residents of DAC countries,active
-40,Non flow,"e.g. GNI, ODA%GNI, Population etc",active
-50,Other flows,e.g. non-ODA component of peacebuilding operations,active
+36,Private Foreign Direct Investment,Private Foreign Direct Investment.,active
+37,Other Private flows at market terms,Private long-term (i.e. over one-year maturity) capital transactions made by residents of DAC countries.,active
+40,Non flow,e.g. GNI,active
+50,Other flows,e.g. non-ODA component of peacebuilding operations),active
diff --git a/iati_datastore/iatilib/codelists/1/Sector.csv b/iati_datastore/iatilib/codelists/1/Sector.csv
index 91cb5d1d..55bfad3a 100644
--- a/iati_datastore/iatilib/codelists/1/Sector.csv
+++ b/iati_datastore/iatilib/codelists/1/Sector.csv
@@ -21,7 +21,6 @@ code,name,description,category,status,budget-alignment:status
 12182,Medical research,General medical research (excluding basic health research and research for prevention and control of NCDs (12382)).,121,active,
 12191,Medical services,"Laboratories, specialised clinics and hospitals (including equipment and supplies); ambulances; dental services; medical rehabilitation. Excludes noncommunicable diseases (123xx).",121,active,
 12196,Health statistics and data,"Collection, production, management and dissemination of statistics and data related to health. Includes health surveys, establishment of health databases, data collection on epidemics, etc.",121,active,
-12196,Health statistics and data,"Collection, production, management and dissemination of statistics and data related to health. Includes health surveys, establishment of health databases, data collection on epidemics, etc.",121,active,
 12220,Basic health care,"Basic and primary health care programmes; paramedical and nursing care programmes; supply of drugs, medicines and vaccines related to basic health care; activities aimed at achieving universal health coverage.",122,active,
 12230,Basic health infrastructure,"District-level hospitals, clinics and dispensaries and related medical equipment; excluding specialised hospitals and clinics (12191).",122,active,
 12240,Basic nutrition,"Micronutrient deficiency identification and supplementation; Infant and young child feeding promotion including exclusive breastfeeding; Non-emergency management of acute malnutrition and other targeted feeding programs (including complementary feeding); Staple food fortification including salt iodization; Nutritional status monitoring and national nutrition surveillance; Research, capacity building, policy development, monitoring and evaluation in support of these interventions. Use code 11250 for school feeding and 43072 for household food security.",122,active,
@@ -102,7 +101,6 @@ code,name,description,category,status,budget-alignment:status
 15185,Local government administration,"Decentralisation processes (including political, administrative and fiscal dimensions); intergovernmental relations and federalism; strengthening local authorities.",151,active,
 15190,"Facilitation of orderly, safe, regular and responsible migration and mobility","Assistance to developing countries that facilitates the orderly, safe, regular and responsible migration and mobility of people. This includes:• Capacity building in migration and mobility policy, analysis, planning and management. This includes support to facilitate safe and regular migration and address irregular migration, engagement with diaspora and programmes enhancing the development impact of remittances and/or their use for developmental projects in developing countries.• Measures to improve migrant labour recruitment systems in developing countries.• Capacity building for strategy and policy development as well as legal and judicial development (including border management) in developing countries. This includes support to address and reduce vulnerabilities in migration, and strengthen the transnational response to smuggling of migrants and preventing and combating trafficking in human beings.• Support to effective strategies to ensure international protection and the right to asylum.• Support to effective strategies to ensure access to justice and assistance for displaced persons.• Assistance to migrants for their safe, dignified, informed and voluntary return to their country of origin (covers only returns from another developing country; assistance to forced returns is excluded from ODA).• Assistance to migrants for their sustainable reintegration in their country of origin (use code 93010 for pre-departure assistance provided in donor countries in the context of voluntary returns). Activities that pursue first and foremost providers' interest are excluded from ODA. Activities addressing the root causes of forced displacement and irregular migration should not be coded here, but under their relevant sector of intervention. In addition, use code 15136 for support to countries' authorities for immigration affairs and services (optional), code 24050 for programmes aiming at reducing the sending costs of remittances, code 72010 for humanitarian aspects of assistance to refugees and internally displaced persons (IDPs) such as delivery of emergency services and humanitarian protection. Use code 93010 when expenditure is for the temporary sustenance of refugees in the donor country, including for their voluntary return and for their reintegration when support is provided in a donor country in connection with the return from that donor country (i.e. pre-departure assistance), or voluntary resettlement in a third developed country.",151,active,
 15196,Government and civil society statistics and data,"Collection, production, management and dissemination of statistics and data related to Government & Civil Society. Includes macroeconomic statistics, government finance, fiscal and public sector statistics, support to development of administrative data infrastructure, civil society surveys.",151,active,
-15196,Government and civil society statistics and data,"Collection, production, management and dissemination of statistics and data related to Government & Civil Society. Includes macroeconomic statistics, government finance, fiscal and public sector statistics, support to development of administrative data infrastructure, civil society surveys.",151,active,
 15210,Security system management and reform,"Technical co-operation provided to parliament, government ministries, law enforcement agencies and the judiciary to assist review and reform of the security system to improve democratic governance and civilian control; technical co-operation provided to government to improve civilian oversight and democratic control of budgeting, management, accountability and auditing of security expenditure, including military budgets, as part of a public expenditure management programme; assistance to civil society to enhance its competence and capacity to scrutinise the security system so that it is managed in accordance with democratic norms and principles of accountability, transparency and good governance. [Other than in the context of an international peacekeeping operation (15230)].",152,active,
 15220,"Civilian peace-building, conflict prevention and resolution","Support for civilian activities related to peace building, conflict prevention and resolution, including capacity building, monitoring, dialogue and information exchange. Bilateral participation in international civilian peace missions such as those conducted by the UN Department of Political Affairs (UNDPA) or the European Union (European Security and Defence Policy), and contributions to civilian peace funds or commissions (e.g. Peacebuilding Commission, Peacebuilding thematic window of the MDG achievement fund etc.). The contributions can take the form of financing or provision of equipment or civilian or military personnel (e.g. for training civilians).(Use code 15230 for bilateral participation in international peacekeeping operations).",152,active,
 15230,Participation in international peacekeeping operations,"Bilateral participation in peacekeeping operations mandated or authorised by the United Nations (UN) through Security Council resolutions, and conducted by international organisations, e.g. UN, NATO, the European Union (Security and Defence Policy security-related operations), or regional groupings of developing countries. Direct contributions to the UN Department for Peacekeeping Operations (UNDPKO) budget are excluded from bilateral ODA (they are reportable in part as multilateral ODA, see Annex 9). The activities that can be reported as bilateral ODA under this code are limited to: human rights and election monitoring; reintegration of demobilised soldiers; rehabilitation of basic national infrastructure; monitoring or retraining of civil administrators and police forces; security sector reform and other rule of law-related activities; training in customs and border control procedures; advice or training in fiscal or macroeconomic stabilisation policy; repatriation and demobilisation of armed factions, and disposal of their weapons; explosive mine removal. The enforcement aspects of international peacekeeping operations are not reportable as ODA. ODA-eligible bilateral participation in peacekeeping operations can take the form of financing or provision of equipment or military or civilian personnel (e.g. police officers). The reportable cost is calculated as the excess over what the personnel and equipment would have cost to maintain had they not been assigned to take part in a peace operation. Costs for military contingents participating in UNDPKO peacekeeping operations are not reportable as ODA. International peacekeeping operations may include humanitarian-type activities (contributions to the form of equipment or personnel), as described in codes 7xxxx. These should be included under code 15230 if they are an integrated part of the activities above, otherwise they should be reported as humanitarian aid. NB: When using this code, indicate the name of the operation in the short description of the activity reported.",152,active,
diff --git a/iati_datastore/iatilib/codelists/2/AidType.csv b/iati_datastore/iatilib/codelists/2/AidType.csv
index 802ed053..db71100f 100644
--- a/iati_datastore/iatilib/codelists/2/AidType.csv
+++ b/iati_datastore/iatilib/codelists/2/AidType.csv
@@ -2,11 +2,13 @@ code,name,description,category,status
 A01,General budget support,"Unearmarked contributions to the government budget including funding to support the implementation of macroeconomic reforms (structural adjustment programmes, poverty reduction strategies). Budget support is a method of financing a recipient country’s budget through a transfer of resources from an external financing agency to the recipient government’s national treasury. The funds thus transferred are managed in accordance with the recipient’s budgetary procedures. Funds transferred to the national treasury for financing programmes or projects managed according to different budgetary procedures from those of the recipient country, with the intention of earmarking the resources for specific uses, are therefore excluded.",A,active
 A02,Sector budget support,"Sector budget support, like general budget support, is a financial contribution to a recipient government’s budget. However, in sector budget support, the dialogue between donors and partner governments focuses on sector-specific concerns, rather than on overall policy and budget priorities.",A,active
 B01,"Core support to NGOs, other private bodies, PPPs and research institutes","Funds are paid over to NGOs (local, national and international) for use at the latter’s discretion, and contribute to programmes and activities which NGOs have developed themselves, and which they implement on their own authority and responsibility. Core contributions to PPPs, funds paid over to foundations (e.g. philanthropic foundations), and contributions to research institutes (public and private) are also recorded here. Annex 2 of the DAC Directives provides a list of INGOs, PPPs and networks core contributions to which may be reported under B01. This list is not exclusive.",B,active
-B02,Core contributions to multilateral institutions,These funds are classified as multilateral ODA (all other categories fall under bilateral ODA). The recipient multilateral institution pools contributions so that they lose their identity and become an integral part of its financial assets. See Annex 2 of the DAC Directives for a comprehensive list of agencies core contributions to which may be reported under B02 (Section I. Multilateral institutions).,B,active
-B03,Contributions to specific-purpose programmes and funds managed by implementing partners,"In addition to their core-funded operations, international organisations, NGOs, PPPs and networks, both in provider and in third countries, set up programmes and funds with a specific sectoral, thematic or geographical focus. Donors’ bilateral contributions to such programmes and funds are recorded here.",B,active
-B031,Contributions to multi-donor/multi-entity funding mechanisms,"Funding mechanisms that pool contributions from several donors and that are implemented by several multilateral entities e.g. UN inter-agency pooled funds, including CERF and country-based pooled funds; Financial Intermediary Funds (GEF, CIFs) for which the World Bank is the Trustee.",B03,active
-B032,Contributions to multi-donor/single-entity funding mechanisms,Contributions to multi-donor funding mechanisms managed by a single multilateral organisation e.g. UN single-agency thematic funds; World Bank or other MDB trust funds. Classify the contribution as B032 even if in the initial stages only one donor contributes to the fund.,B03,active
-B033,Contributions to single-donor funding mechanisms and contributions earmarked for a specific funding window or geographical location,"Contributions to funding mechanisms where the donor has a significant influence on the allocation of funds. This includes contributions to single-donor trust funds and earmarked contributions to specific countries/geographical locations or funding windows within multi-donor trust funds. When the donor designs the activity but channels it through an international organisation, the activity should be classified as C01.",B03,active
+B02,Core contributions to multilateral institutions and global funds,"These funds are classified as multilateral (all other categories are bilateral). The recipient multilateral institution pools contributions so that they lose their identity and become an integral part of its financial assets or liabilities. Also includes Financial Intermediary Funds (GEF, CIFs) for which the World Bank is the Trustee, as well as some UN inter-agency pooled funds, such as CERF and the UN Peacebuilding Fund. See Annex 2 of the Reporting Directives for a comprehensive list of agencies, core contributions to which may be reported under B02 and its subcategories. (Section I. Multilateral institutions). Nota bene: contributions to multilateral development organisations beyond Annex 2 are not reportable in the DAC statistics. The non-ODA components of core support to multilateral organisations included in Annex 2 are not reportable either.",B,active
+B021,Core contributions to multilateral institutions,Contributions in this category are pooled by the recipient multilateral institution and become an integral part of its financial assets or liabilities.,B,active
+B022,Core contributions to global funds,"Contributions to global funds classified as multilateral including Financial Intermediary Funds for which the World Bank is the Trustee and which have gone through the Annex 2 process (GEF, CIFs) as well as some UN inter-agency pooled funds, e.g. CERF and the UN Peacebuilding Fund.",B,active
+B03,Contributions to specific-purpose programmes and funds managed by implementing partners,"In addition to their core-funded operations, international organisations – multilateral agencies, NGOs, PPPs or networks – both in provider and in third countries, set up programmes and funds with a specific sectoral, thematic or geographical focus. Donors’ bilateral contributions to such programmes and funds are recorded here. Use categories B031 and B032 for trust funds managed by the UN (all designed as multi-donor) unless contributions are earmarked for a specific geographical location or funding window.",B,active
+B031,Contributions to multi-donor/multi-entity funding mechanisms,"Contributions to funding mechanisms (specific-purpose programmes and funds) that pool resources from several providers and from which several international organisations – multilateral agencies, NGOs, PPPs or networks – may be allocated funds for implementation e.g. contributions to UN country-based pooled funds and country-level development funds. Excludes contributions to global funds classified as multilateral (see B022). Includes Financial Intermediary Funds for which the World Bank is the Trustee and which have not gone through the Annex 2 process.",B,active
+B032,Contributions to multi-donor/single-entity funding mechanisms,"Contributions to multi-donor funding mechanisms (specific-purpose programmes and funds) managed by a single international organisation – multilateral agency, NGO, PPP or network – e.g. UN single-agency thematic funds; World Bank or other MDB trust funds. Classify the contribution as B032 even if in the initial stages only one donor contributes to the fund.",B,active
+B033,Contributions to single-donor funding mechanisms and contributions earmarked for a specific funding window or geographical location,"Contributions to funding mechanisms (specific-purpose programmes and funds) where the donor has a significant influence on the allocation of funds. This includes contributions to single-donor trust funds and earmarked contributions to specific countries/geographical locations or funding windows within multi-donor trust funds. When the donor designs the activity but channels it through an international organisation, the activity should be classified as C01.",B,active
 B04,Basket funds/pooled funding,"The donor contributes funds to an autonomous account, managed jointly with other donors and/or the recipient. The account will have specific purposes, modes of disbursement and accountability mechanisms, and a limited time frame. Basket funds are characterised by common project documents, common funding contracts and common reporting/audit procedures with all donors. Donors’ contributions to funds managed autonomously by international organisations are recorded under B03.",B,active
 C01,Project-type interventions,"A project is a set of inputs, activities and outputs, agreed with the partner country*, to reach specific objectives/outcomes within a defined time frame, with a defined budget and a defined geographical area. Projects can vary significantly in terms of objectives, complexity, amounts involved and duration. There are smaller projects that might involve modest financial resources and last only a few months, whereas large projects might involve more significant amounts, entail successive phases and last for many years. A large project with a number of different components is sometimes referred to as a programme, but should nevertheless be recorded here. Feasibility studies, appraisals and evaluations are included (whether designed as part of projects/programmes or dedicated funding arrangements). Academic studies, research and development, trainings, scholarships, and other technical assistance activities not directly linked to development projects/programmes should instead be recorded under D02. Aid channelled through NGOs or multilaterals is also recorded here. This includes payments for NGOs and multilaterals to implement donors’ projects and programmes, and funding of specified NGOs projects. By contrast, core funding of NGOs and multilaterals as well as contributions to specific-purpose funds are recorded under B.* In the cases of equity investments, humanitarian aid or aid channelled through NGOs, projects are recorded here even if there was no direct agreement between the donor and the partner country. Contributions to single-donor trust funds and contributions to trust funds earmarked for a specific funding window and/or country are recorded under B033.",C,active
 D01,Donor country personnel,"Experts, consultants, teachers, academics, researchers, volunteers and contributions to public and private bodies for sending experts to developing countries.",D,active
diff --git a/iati_datastore/iatilib/codelists/2/FlowType.csv b/iati_datastore/iatilib/codelists/2/FlowType.csv
index a7f166df..c398375e 100644
--- a/iati_datastore/iatilib/codelists/2/FlowType.csv
+++ b/iati_datastore/iatilib/codelists/2/FlowType.csv
@@ -1,11 +1,11 @@
 code,name,description,status
 10,ODA,Official Development Assistance,active
 20,OOF,Other Official Flows,withdrawn
-21,Non-export credit OOF,"Other Official Flows, excl. export credits",active
-22,Officially supported export credits,Officially supported export credits. Covers both official direct export credits and private export credits under official guarantee or insurance,active
-30,Private Development Finance,"Financing by civil society organisations (NGOs, philantropic foundations, etc.)",active
+21,Non-export credit OOF,"Other Official Flows, excl. export credits.",active
+22,Officially supported export credits,Officially supported export credits. Covers both official direct export credits and private export credits under official guarantee or insurance.,active
+30,Private grants,made by NGOs and other civil society organisations (e.e. philantropic foundations) based in the reporting DAC country,active
 35,Private Market,Private long-term (i.e. over one-year maturity) capital transactions made by residents of DAC countries,withdrawn
-36,Private Foreign Direct Investment,Private Foreign Direct Investment,active
-37,Other Private flows at market terms,Private long-term (i.e. over one-year maturity) capital transactions made by residents of DAC countries,active
-40,Non flow,"e.g. GNI, ODA%GNI, Population etc",active
-50,Other flows,e.g. non-ODA component of peacebuilding operations,active
+36,Private Foreign Direct Investment,Private Foreign Direct Investment.,active
+37,Other Private flows at market terms,Private long-term (i.e. over one-year maturity) capital transactions made by residents of DAC countries.,active
+40,Non flow,e.g. GNI,active
+50,Other flows,e.g. non-ODA component of peacebuilding operations),active
diff --git a/iati_datastore/iatilib/codelists/2/Sector.csv b/iati_datastore/iatilib/codelists/2/Sector.csv
index 91cb5d1d..55bfad3a 100644
--- a/iati_datastore/iatilib/codelists/2/Sector.csv
+++ b/iati_datastore/iatilib/codelists/2/Sector.csv
@@ -21,7 +21,6 @@ code,name,description,category,status,budget-alignment:status
 12182,Medical research,General medical research (excluding basic health research and research for prevention and control of NCDs (12382)).,121,active,
 12191,Medical services,"Laboratories, specialised clinics and hospitals (including equipment and supplies); ambulances; dental services; medical rehabilitation. Excludes noncommunicable diseases (123xx).",121,active,
 12196,Health statistics and data,"Collection, production, management and dissemination of statistics and data related to health. Includes health surveys, establishment of health databases, data collection on epidemics, etc.",121,active,
-12196,Health statistics and data,"Collection, production, management and dissemination of statistics and data related to health. Includes health surveys, establishment of health databases, data collection on epidemics, etc.",121,active,
 12220,Basic health care,"Basic and primary health care programmes; paramedical and nursing care programmes; supply of drugs, medicines and vaccines related to basic health care; activities aimed at achieving universal health coverage.",122,active,
 12230,Basic health infrastructure,"District-level hospitals, clinics and dispensaries and related medical equipment; excluding specialised hospitals and clinics (12191).",122,active,
 12240,Basic nutrition,"Micronutrient deficiency identification and supplementation; Infant and young child feeding promotion including exclusive breastfeeding; Non-emergency management of acute malnutrition and other targeted feeding programs (including complementary feeding); Staple food fortification including salt iodization; Nutritional status monitoring and national nutrition surveillance; Research, capacity building, policy development, monitoring and evaluation in support of these interventions. Use code 11250 for school feeding and 43072 for household food security.",122,active,
@@ -102,7 +101,6 @@ code,name,description,category,status,budget-alignment:status
 15185,Local government administration,"Decentralisation processes (including political, administrative and fiscal dimensions); intergovernmental relations and federalism; strengthening local authorities.",151,active,
 15190,"Facilitation of orderly, safe, regular and responsible migration and mobility","Assistance to developing countries that facilitates the orderly, safe, regular and responsible migration and mobility of people. This includes:• Capacity building in migration and mobility policy, analysis, planning and management. This includes support to facilitate safe and regular migration and address irregular migration, engagement with diaspora and programmes enhancing the development impact of remittances and/or their use for developmental projects in developing countries.• Measures to improve migrant labour recruitment systems in developing countries.• Capacity building for strategy and policy development as well as legal and judicial development (including border management) in developing countries. This includes support to address and reduce vulnerabilities in migration, and strengthen the transnational response to smuggling of migrants and preventing and combating trafficking in human beings.• Support to effective strategies to ensure international protection and the right to asylum.• Support to effective strategies to ensure access to justice and assistance for displaced persons.• Assistance to migrants for their safe, dignified, informed and voluntary return to their country of origin (covers only returns from another developing country; assistance to forced returns is excluded from ODA).• Assistance to migrants for their sustainable reintegration in their country of origin (use code 93010 for pre-departure assistance provided in donor countries in the context of voluntary returns). Activities that pursue first and foremost providers' interest are excluded from ODA. Activities addressing the root causes of forced displacement and irregular migration should not be coded here, but under their relevant sector of intervention. In addition, use code 15136 for support to countries' authorities for immigration affairs and services (optional), code 24050 for programmes aiming at reducing the sending costs of remittances, code 72010 for humanitarian aspects of assistance to refugees and internally displaced persons (IDPs) such as delivery of emergency services and humanitarian protection. Use code 93010 when expenditure is for the temporary sustenance of refugees in the donor country, including for their voluntary return and for their reintegration when support is provided in a donor country in connection with the return from that donor country (i.e. pre-departure assistance), or voluntary resettlement in a third developed country.",151,active,
 15196,Government and civil society statistics and data,"Collection, production, management and dissemination of statistics and data related to Government & Civil Society. Includes macroeconomic statistics, government finance, fiscal and public sector statistics, support to development of administrative data infrastructure, civil society surveys.",151,active,
-15196,Government and civil society statistics and data,"Collection, production, management and dissemination of statistics and data related to Government & Civil Society. Includes macroeconomic statistics, government finance, fiscal and public sector statistics, support to development of administrative data infrastructure, civil society surveys.",151,active,
 15210,Security system management and reform,"Technical co-operation provided to parliament, government ministries, law enforcement agencies and the judiciary to assist review and reform of the security system to improve democratic governance and civilian control; technical co-operation provided to government to improve civilian oversight and democratic control of budgeting, management, accountability and auditing of security expenditure, including military budgets, as part of a public expenditure management programme; assistance to civil society to enhance its competence and capacity to scrutinise the security system so that it is managed in accordance with democratic norms and principles of accountability, transparency and good governance. [Other than in the context of an international peacekeeping operation (15230)].",152,active,
 15220,"Civilian peace-building, conflict prevention and resolution","Support for civilian activities related to peace building, conflict prevention and resolution, including capacity building, monitoring, dialogue and information exchange. Bilateral participation in international civilian peace missions such as those conducted by the UN Department of Political Affairs (UNDPA) or the European Union (European Security and Defence Policy), and contributions to civilian peace funds or commissions (e.g. Peacebuilding Commission, Peacebuilding thematic window of the MDG achievement fund etc.). The contributions can take the form of financing or provision of equipment or civilian or military personnel (e.g. for training civilians).(Use code 15230 for bilateral participation in international peacekeeping operations).",152,active,
 15230,Participation in international peacekeeping operations,"Bilateral participation in peacekeeping operations mandated or authorised by the United Nations (UN) through Security Council resolutions, and conducted by international organisations, e.g. UN, NATO, the European Union (Security and Defence Policy security-related operations), or regional groupings of developing countries. Direct contributions to the UN Department for Peacekeeping Operations (UNDPKO) budget are excluded from bilateral ODA (they are reportable in part as multilateral ODA, see Annex 9). The activities that can be reported as bilateral ODA under this code are limited to: human rights and election monitoring; reintegration of demobilised soldiers; rehabilitation of basic national infrastructure; monitoring or retraining of civil administrators and police forces; security sector reform and other rule of law-related activities; training in customs and border control procedures; advice or training in fiscal or macroeconomic stabilisation policy; repatriation and demobilisation of armed factions, and disposal of their weapons; explosive mine removal. The enforcement aspects of international peacekeeping operations are not reportable as ODA. ODA-eligible bilateral participation in peacekeeping operations can take the form of financing or provision of equipment or military or civilian personnel (e.g. police officers). The reportable cost is calculated as the excess over what the personnel and equipment would have cost to maintain had they not been assigned to take part in a peace operation. Costs for military contingents participating in UNDPKO peacekeeping operations are not reportable as ODA. International peacekeeping operations may include humanitarian-type activities (contributions to the form of equipment or personnel), as described in codes 7xxxx. These should be included under code 15230 if they are an integrated part of the activities above, otherwise they should be reported as humanitarian aid. NB: When using this code, indicate the name of the operation in the short description of the activity reported.",152,active,