Allow querying against identifier and category
Disallow ambiguous queries
Output of  command uses query format
More robust error handling (with color!)