Add client side code to do endpoint map queries. Currently does one