Fix completion bug
Add name filtering to events