Fixed bug with event not showing on edit