adding changes to fix for cluster dragging