Fix command suggestions when an endpoint needs to be targetted

[Finishes #65764594]