feat: improve selectors and update flow