FL-703: eselect update