refactor Today xml
added geolocalization