more fixes for event calendar