Change PaginatedState to be more consistent with PaginatedChoiceState