Support #6318 and adding pagination and table sorting to all tables