upd front-end to split locations in 2 calls + api call