Bugfix: values of system columns where not properly escaped.
Merge branch 'tng' into rework-sorting