Update and cleanup server query section in the API concept doc. Change-Id: Id0e2cb31bd6234be169eac66bc97fd1635ef6704