Refactored/simplified handling time + incorrect characters for events