Removed dependency Query -> Server