CoreParameter: Added missing country case checks