Fix some in paging and details