Merge pull request #13697 from greenpeace-cee/fix-event-search