enhancements
correct picker behavior