Geomap: Switched most events to the JEP model