improving event tagging, but a bit of a "chantier"...