fixed org / manufacturer drag & drop