Fix http event names
Fix tags not included
Attempt to catch EOF