Fix case of empty results from client
More elegant solution for interleaving a comma