Update SurfaceDiskQueryEngine to allow concentric surfaces