fixes in the user event parsing logic