Hotfix/fix drag and drop default variant