Reformat string concatenation queries and result handling

[ross-spencer]

Some queries optimize the need for string concatenation too early, for example:

• "SELECT 'ns:' || NSDATA.NS_NAME || ' ' || IDDATA.ID, count(IDDATA.ID) as TOTAL\n" (ns + Namespace + Name + id + count)

This leaves very few options to manipulate this afterwards, e.g. for handling versions where version is None. It shouldn't be done at the query layer here when we still want to format the results both as data and present them.