Fixed bugs with literal and variable definition drag and drop