ENYO-2065 fixes (designer drag and drop issues)