Bugfix + table scroll performance improvement