Fix for filtering on the user events