Updated server side and client side for city