Improved drag selection logic