EventSelectionOverlap: fixing the code to let it work again; plus minor code modifications