make "uri" and "id" always appear in query for output

We have numerous output formats: tsv,list,json,js,id,uri,yaml

Two of them depend of on actual data returned from API:
* id
* uri

Due to this we need to ensure that these two attributes are checked for and always added (if missing) to `defaultQuery` set on command or generated by `generateQuery()`.

This needs a generic approach unlike quick fix provided in PR #548