Adding fixes for event styling and filters