refactor susetags parsing