Enhancements in directory selector