- fixed test errors
- even better tag handling