Fixed pagination and duplication