Fix paging and location