Improved management select handling