Restored dataset/country prefilling for Add and Edit