and fix the selector to make sure we preselect the correct matches for already persisted segments