Event search bugfix