better searching events
Merge origin/master