some changes. removal of tag-suffixes stil not working