better handing of GES type events