Add in missing targeted org requirements to commands dealing with spaces
[finishes #60133226]