Merge the query fix into the server.properties branch