Preserve CSV column order and render KWIC left context properly
Merge branch 'feature_kwic' into release-3.3