Fix EventManager search method