OOIION-1426: Kml location fix and OOIION-1513