event handling on router improved