Fixed some issues with QueryServer and anchoring