small fixes
Merge branch 'master' into joap-subscription
only parse event tag