Adding ability to search registered events