improve list and paging