Update drag handling to latest the-behavior