small fixes on event table behavior