upd: geolocation, entities