diff --git a/src/Umbraco.Core/Persistence/Repositories/TagsRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TagsRepository.cs
index 543ac9b8e5..acb178bb77 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TagsRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/TagsRepository.cs
@@ -486,6 +486,10 @@ namespace Umbraco.Core.Persistence.Repositories
///
private static string GetTagSet(IEnumerable tagsToInsert)
{
+ //TODO: Fix this query, since this is going to be basically a unique query each time, this will cause some mem usage in peta poco,
+ // and surely there's a nicer way!
+ //TODO: When we fix, be sure to remove the @ symbol escape
+
var array = tagsToInsert
.Select(tag =>
string.Format("select '{0}' as Tag, '{1}' as " + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("Group") + @"",