Sort events on SelectionActivity
Minor changes