More work on server queries