Table can now be sorted correctly after filtering data.
Merge origin/master