SWC-772 Fix and edit pager for tables