BUGFIX: Ensure consistent endings of tags