added support for more tags, bugfix for multi-firing event problem