pushing locations enhancements. fixed country code and empty space as null