Fix issue #9475, use node-selector instead of nodName for generic restore