Reverted table pagination fix