Fix setting Geo Location fields (#488)