MLDS-856 Remove Home Country Section and add to other sections