enhancement of EMSC geo based api handler