FORGE-1630: Fixed selected resource