Improve linking of event items

Linking is now done using a regular expression trying to find only valid positions of the text we're looking for. This is now also done in a separate method so there's less clutter with duplicate calls.

I know this might not merge cleanly anymore, because you're working on version 2.