move restore logic to RegisterQueues()n