Improved select genre