Fixed selection event and inverted underscoring on both events
Merge branch 'master' into manage_scroll