Also fix query server