More changes to drag event and marker selection