improve country / city api calls