Issue 9477 - Improve menuselect labels