Ensure that column titles are synched with column chooser dropdown and filters.
Fix up tests
Merge with master