Fixed a bug with the server query API