uppercase check and non-us geo fix