#465 Commented out paging