a couple of fixes in the user events logic
first steps toward user event filters