updated the picker to work with top-level variants