Fix regex events
More event reworking