BREAKING change: convert to JSON. Given we're not tracking uids for each query uid, this will cause problems for the result. So, have to re-structure stuff here.