Better handling of events without links
Merge branch 'develop'

* develop:
  Better handling of events without links