Improvements to description selector