Fix for Show selected name when using 'as' #35