updated to latest x-tag-components