diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 7caf69e668..388d9389f2 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -449,8 +449,8 @@ class ImportFile:
 			data_without_first_row = data[1:]
 			for row in data_without_first_row:
 				row_values = row.get_values(parent_column_indexes)
-				# if the row is blank or same content as the previous parent row, it's a child row doc
-				if all([v in INVALID_VALUES for v in row_values]) or row_values == parent_row_values:
+				# if the row is blank, it's a child row doc
+				if all([v in INVALID_VALUES for v in row_values]):
 					rows.append(row)
 					continue
 				# if we encounter a row which has values in parent columns,
diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index 445ca1184d..c237b8e436 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -75,7 +75,7 @@ class File(Document):
 			self.add_comment_in_reference_doc('Attachment',
 				_('Added {0}').format("<a href='{file_url}' target='_blank'>{file_name}</a>{icon}".format(**{
 					"icon": ' <i class="fa fa-lock text-warning"></i>' if self.is_private else "",
-					"file_url": quote(self.file_url) if self.file_url else self.file_name,
+					"file_url": quote(frappe.safe_encode(self.file_url)) if self.file_url else self.file_name,
 					"file_name": self.file_name or self.file_url
 				})))