GUI-818

properly handle ephemeral by looking at virtual_name on mapping