Added unsafe flag to strip out "@" character for attribute names