+ json string fixes
+ fixed count(... #within file) for non-trivial queries
Authored by: mukau 2014-12-04
Parent: [r353]
Child: [r355]