minor changes in auto_picker