partial fix on events display