Allow single-provider node queries using -f

Fixes #9008.
Fixes #8658.