Complete command suggestions2

Supersedes #279
This is still not correct in all cases, you'll also have to set the `name` parameter to be sure.