Make target command clear org and space when necessary

[Finishes #66713898]