Fixed fields for national_reports and country_plans
Merge branch 'leo' of github.com:InforMEA/leo into leo