Country return null fixes