Fixed to use change-ids on list view