fixed file upload in country forms, change url plurals to singular