minors: 1. disambiguation context support in server / 2. fix a geo class