bugfixes
Merge branch 'table-sort-key' into develop
keeping up