Fix samples and update advanced-select