optimize picker logic