Fix json formatting of simple events, auto fill location from GEOADDR source

Fix json formatting of simple events, auto fill location from GEOADDR
source