Fix for selected item showing value instead of text