Cleanups to QueryRemoteJob

Refs #7295