Improved: Don't include \r\n & ' ' when addding tag