diff --git a/Signum.Engine.Extensions/Alerts/AlertLogic.cs b/Signum.Engine.Extensions/Alerts/AlertLogic.cs
index f1daef16b3..0368b9b5d5 100644
--- a/Signum.Engine.Extensions/Alerts/AlertLogic.cs
+++ b/Signum.Engine.Extensions/Alerts/AlertLogic.cs
@@ -62,6 +62,7 @@ public static void Start(SchemaBuilder sb, params Type[] registerExpressionsFor)
                     a.Title,
                     Text = a.Text!.Etc(100),
                     a.Target,
+                    a.ParentTarget,
                     a.Recipient,
                     a.CreationDate,
                     a.CreatedBy,
@@ -294,12 +295,12 @@ public static void RegisterAlertType(AlertTypeSymbol alertType, AlertTypeOptions
         SystemAlertTypes.Add(alertType, options ?? new AlertTypeOptions());
     }
 
-    public static AlertEntity? CreateAlert(this IEntity entity, AlertTypeSymbol alertType, string? text = null, string?[]? textArguments = null, DateTime? alertDate = null, Lite<IUserEntity>? createdBy = null, string? title = null, Lite<IUserEntity>? recipient = null)
+    public static AlertEntity? CreateAlert(this IEntity entity, AlertTypeSymbol alertType, string? text = null, string?[]? textArguments = null, DateTime? alertDate = null, Lite<IUserEntity>? createdBy = null, string? title = null, Lite<IUserEntity>? recipient = null, Lite<Entity>? parentTarget = null)
     {
-        return CreateAlert(entity.ToLiteFat(), alertType, text, textArguments, alertDate, createdBy, title, recipient);
+        return CreateAlert(entity.ToLiteFat(), alertType, text, textArguments, alertDate, createdBy, title, recipient, parentTarget);
     }
 
-    public static AlertEntity? CreateAlert(this Lite<IEntity> entity, AlertTypeSymbol alertType, string? text = null, string?[]? textArguments = null, DateTime? alertDate = null, Lite<IUserEntity>? createdBy = null, string? title = null, Lite<IUserEntity>? recipient = null)
+    public static AlertEntity? CreateAlert(this Lite<IEntity> entity, AlertTypeSymbol alertType, string? text = null, string?[]? textArguments = null, DateTime? alertDate = null, Lite<IUserEntity>? createdBy = null, string? title = null, Lite<IUserEntity>? recipient = null, Lite<Entity>? parentTarget = null)
     {
         if (Started == false)
             return null;
@@ -314,6 +315,7 @@ public static void RegisterAlertType(AlertTypeSymbol alertType, AlertTypeOptions
                 TextArguments = textArguments?.ToString("\n###\n"),
                 TextField = text,
                 Target = (Lite<Entity>)entity,
+                ParentTarget = parentTarget,
                 AlertType = alertType,
                 Recipient = recipient
             };
@@ -413,6 +415,10 @@ public static void DeleteAllAlerts(Lite<Entity> target)
             Database.Query<AlertEntity>()
                 .Where(a => a.Target.Is(target))
                 .UnsafeDelete();
+
+            Database.Query<AlertEntity>()
+                .Where(a => a.ParentTarget.Is(target))
+                .UnsafeDelete();
         }
     }
 
diff --git a/Signum.Engine.Extensions/Authorization/ActiveDirectoryAuthorizer.cs b/Signum.Engine.Extensions/Authorization/ActiveDirectoryAuthorizer.cs
index 78cbfa440c..184ccb1ff1 100644
--- a/Signum.Engine.Extensions/Authorization/ActiveDirectoryAuthorizer.cs
+++ b/Signum.Engine.Extensions/Authorization/ActiveDirectoryAuthorizer.cs
@@ -212,11 +212,13 @@ public virtual UserEntity CreateUserInternal(IAutoCreateUserContext ctx)
         var config = GetConfig();
         if (ctx is DirectoryServiceAutoCreateUserContext ds)
         {
-            var groups = ds.GetUserPrincipal().GetGroups(ds.PrincipalContext);
+            var groups = ds.GetUserPrincipal().GetGroups(ds.PrincipalContext).ToList();
             var role = config.RoleMapping.FirstOrDefault(m =>
             {
                 Guid.TryParse(m.ADNameOrGuid, out var guid);
-                return groups.Any(g => g.Name == m.ADNameOrGuid || g.Guid == guid);
+                var found = groups.Any(g => g.Name == m.ADNameOrGuid || g.Guid == guid);
+       
+                return found;
             })?.Role ?? config.DefaultRole;
 
             if (role != null)
diff --git a/Signum.Engine.Extensions/UserQueries/UserQueryLogic.cs b/Signum.Engine.Extensions/UserQueries/UserQueryLogic.cs
index a4340c5d55..ffeb72769c 100644
--- a/Signum.Engine.Extensions/UserQueries/UserQueryLogic.cs
+++ b/Signum.Engine.Extensions/UserQueries/UserQueryLogic.cs
@@ -253,19 +253,19 @@ public static void RegisterRoleTypeCondition(SchemaBuilder sb, TypeConditionSymb
                     {
                         using (DelayedConsole.Delay(() => Console.WriteLine(" Filters:")))
                         {
-                            foreach (var item in uq.Filters.ToList())
+                            foreach (var filter in uq.Filters.ToList())
                             {
-                                if (item.Token == null)
+                                if (filter.Token == null)
                                     continue;
 
-                                QueryTokenEmbedded token = item.Token;
-                                switch (QueryTokenSynchronizer.FixToken(replacements, ref token, qd, options | SubTokensOptions.CanAnyAll, " {0} {1}".FormatWith(item.Operation, item.ValueString), allowRemoveToken: true, allowReCreate: false))
+                                QueryTokenEmbedded token = filter.Token;
+                                switch (QueryTokenSynchronizer.FixToken(replacements, ref token, qd, options | SubTokensOptions.CanAnyAll, " {0} {1}".FormatWith(filter.Operation, filter.ValueString), allowRemoveToken: true, allowReCreate: false))
                                 {
                                     case FixTokenResult.Nothing: break;
                                     case FixTokenResult.DeleteEntity: return table.DeleteSqlSync(uq, u => u.Guid == uq.Guid);
-                                    case FixTokenResult.RemoveToken: uq.Filters.Remove(item); break;
+                                    case FixTokenResult.RemoveToken: uq.Filters.Remove(filter); break;
                                     case FixTokenResult.SkipEntity: return null;
-                                    case FixTokenResult.Fix: item.Token = token; break;
+                                    case FixTokenResult.Fix: filter.Token = token; break;
                                     default: break;
                                 }
                             }
@@ -276,18 +276,32 @@ public static void RegisterRoleTypeCondition(SchemaBuilder sb, TypeConditionSymb
                     {
                         using (DelayedConsole.Delay(() => Console.WriteLine(" Columns:")))
                         {
-                            foreach (var item in uq.Columns.ToList())
+                            foreach (var col in uq.Columns.ToList())
                             {
-                                QueryTokenEmbedded token = item.Token;
-                                switch (QueryTokenSynchronizer.FixToken(replacements, ref token, qd, options, item.DisplayName.HasText() ? " '{0}'".FormatWith(item.DisplayName) : null, allowRemoveToken: true, allowReCreate: false))
+                                QueryTokenEmbedded token = col.Token;
+                                switch (QueryTokenSynchronizer.FixToken(replacements, ref token, qd, options, col.DisplayName.HasText() ? " '{0}' (Summary)".FormatWith(col.DisplayName) : null, allowRemoveToken: true, allowReCreate: false))
                                 {
                                     case FixTokenResult.Nothing: break;
-                                    case FixTokenResult.DeleteEntity:; return table.DeleteSqlSync(uq, u => u.Guid == uq.Guid);
-                                    case FixTokenResult.RemoveToken: uq.Columns.Remove(item); break;
+                                    case FixTokenResult.DeleteEntity: return table.DeleteSqlSync(uq, u => u.Guid == uq.Guid);
+                                    case FixTokenResult.RemoveToken: uq.Columns.Remove(col); break;
                                     case FixTokenResult.SkipEntity: return null;
-                                    case FixTokenResult.Fix: item.Token = token; break;
+                                    case FixTokenResult.Fix: col.Token = token; break;
                                     default: break;
                                 }
+
+                                if(col.SummaryToken != null)
+                                {
+                                    QueryTokenEmbedded sumToken = col.SummaryToken;
+                                    switch (QueryTokenSynchronizer.FixToken(replacements, ref sumToken, qd, options | SubTokensOptions.CanAggregate, col.DisplayName.HasText() ? " '{0}'".FormatWith(col.DisplayName) : null, allowRemoveToken: true, allowReCreate: false))
+                                    {
+                                        case FixTokenResult.Nothing: break;
+                                        case FixTokenResult.DeleteEntity: return table.DeleteSqlSync(uq, u => u.Guid == uq.Guid);
+                                        case FixTokenResult.RemoveToken: col.SummaryToken = null; break;
+                                        case FixTokenResult.SkipEntity: return null;
+                                        case FixTokenResult.Fix: col.SummaryToken = sumToken; break;
+                                        default: break;
+                                    }
+                                }
                             }
                         }
                     }
@@ -296,16 +310,16 @@ public static void RegisterRoleTypeCondition(SchemaBuilder sb, TypeConditionSymb
                     {
                         using (DelayedConsole.Delay(() => Console.WriteLine(" Orders:")))
                         {
-                            foreach (var item in uq.Orders.ToList())
+                            foreach (var ord in uq.Orders.ToList())
                             {
-                                QueryTokenEmbedded token = item.Token;
-                                switch (QueryTokenSynchronizer.FixToken(replacements, ref token, qd, options, " " + item.OrderType.ToString(), allowRemoveToken: true, allowReCreate: false))
+                                QueryTokenEmbedded token = ord.Token;
+                                switch (QueryTokenSynchronizer.FixToken(replacements, ref token, qd, options, " " + ord.OrderType.ToString(), allowRemoveToken: true, allowReCreate: false))
                                 {
                                     case FixTokenResult.Nothing: break;
                                     case FixTokenResult.DeleteEntity: return table.DeleteSqlSync(uq, u => u.Guid == uq.Guid);
-                                    case FixTokenResult.RemoveToken: uq.Orders.Remove(item); break;
+                                    case FixTokenResult.RemoveToken: uq.Orders.Remove(ord); break;
                                     case FixTokenResult.SkipEntity: return null;
-                                    case FixTokenResult.Fix: item.Token = token; break;
+                                    case FixTokenResult.Fix: ord.Token = token; break;
                                     default: break;
                                 }
                             }
diff --git a/Signum.Engine.Extensions/Word/HtmlToWordConverter.cs b/Signum.Engine.Extensions/Word/HtmlToWordConverter.cs
index 8f44a832c2..d0713c9a78 100644
--- a/Signum.Engine.Extensions/Word/HtmlToWordConverter.cs
+++ b/Signum.Engine.Extensions/Word/HtmlToWordConverter.cs
@@ -1,4 +1,5 @@
 using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
 using HtmlAgilityPack;
 using System;
@@ -6,7 +7,8 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using System.Web;
+
 namespace Signum.Engine.Word;
 
 public static class HtmlToWordConverter
@@ -20,6 +22,7 @@ public static IEnumerable<OpenXmlElement> HtmlToWord(string html, WordTemplatePa
 
         htmlDoc.LoadHtml(html);
         var currentParagraph = p.CurrentTokenNode!.Ancestors<Paragraph>().FirstEx();
+
 
         var elements = HtmlToWordPrivate(htmlDoc.DocumentNode, rp =>
         {
@@ -29,7 +32,7 @@ public static IEnumerable<OpenXmlElement> HtmlToWord(string html, WordTemplatePa
         {
             currentParagraph.ParagraphProperties.CopyTo(pp);
 
-        }).ToList();
+        }, p.Document).ToList();
 
         if (elements.Any(a => a is Paragraph))
             elements.RemoveAll(a => a is Run r && string.IsNullOrWhiteSpace(r.InnerText));
@@ -37,55 +40,227 @@ public static IEnumerable<OpenXmlElement> HtmlToWord(string html, WordTemplatePa
         return elements;
     }
 
-    private static IEnumerable<OpenXmlElement> HtmlToWordPrivate(HtmlNode htmlNode, Action<RunProperties>? addRunProperties, Action<ParagraphProperties>? addParagraphProperties)
+    private static IEnumerable<OpenXmlElement> HtmlToWordPrivate(HtmlNode htmlNode, Action<RunProperties>? addRunProperties, Action<ParagraphProperties>? addParagraphProperties, OpenXmlPackage document)
     {
         switch (htmlNode.Name)
         {
             case "#document":
-                return htmlNode.ChildNodes.SelectMany(c => HtmlToWordPrivate(c, addRunProperties, addParagraphProperties)).ToArray();
+                return htmlNode.ChildNodes.SelectMany(c => HtmlToWordPrivate(c, addRunProperties, addParagraphProperties, document)).ToArray();
 
+            case "li":
             case "p":
-
-                var paragraphProperties = new ParagraphProperties();
-                addParagraphProperties?.Invoke(paragraphProperties);
-                var childrens = htmlNode.ChildNodes.SelectMany(c => HtmlToWordPrivate(c, addRunProperties, addParagraphProperties)).ToList();
-                childrens.Insert(0, paragraphProperties);
-                return new[] { new Paragraph(childrens) };
-
+                {
+                    var pp = new ParagraphProperties();
+                    addParagraphProperties?.Invoke(pp);
+                    var childrens = htmlNode.ChildNodes.SelectMany(c => HtmlToWordPrivate(c, addRunProperties, addParagraphProperties, document)).ToList();
+                    childrens.Insert(0, pp);
+                    return new[] { new Paragraph(childrens) };
+                }
             case "em":
                 return htmlNode.ChildNodes.SelectMany(c => HtmlToWordPrivate(c, addRunProperties + ((RunProperties rp) =>
                 {
                     rp.Append(new Italic(), new ItalicComplexScript());
-                }), addParagraphProperties));
+                }), addParagraphProperties, document));
 
             case "strong":
                 return htmlNode.ChildNodes.SelectMany(c => HtmlToWordPrivate(c, addRunProperties + ((RunProperties rp) =>
                 {
                     rp.Append(new Bold(), new BoldComplexScript());
-                }), addParagraphProperties));
+                }), addParagraphProperties, document));
 
             case "ins":
             case "u":
                 return htmlNode.ChildNodes.SelectMany(c => HtmlToWordPrivate(c, addRunProperties + ((RunProperties rp) =>
                 {
                     rp.Append(new Underline() { Val = UnderlineValues.Single });
-                }), addParagraphProperties));
-
+                }), addParagraphProperties, document));
+
+
+            case "h1":
+            case "h2":
+            case "h3":
+            case "h4":
+                {
+                    var mainDocument = document.GetPartsOfType<MainDocumentPart>().SingleEx();
+
+                    var hi = htmlNode.Name.After("h");
+
+
+                    Style headingStyle;
+                    {
+                        var styles = mainDocument.GetPartsOfType<StyleDefinitionsPart>().FirstOrDefault();
+                        if (styles == null)
+                        {
+                            styles = mainDocument.AddNewPart<StyleDefinitionsPart>();
+                            styles.Styles = new Styles();
+                        }
+
+                        headingStyle = styles.Styles!.Elements<Style>().FirstOrDefault(a => a.StyleName?.Val == "heading " + hi)!;
+
+                        if (headingStyle == null)
+                        {
+                            var size = hi == "1" ? "32" :
+                                hi == "2" ? "26" :
+                                hi == "3" ? "24" :
+                                hi == "4" ? "22" : 
+                                throw new UnexpectedValueException(hi);
+
+                            var color = hi == "1" ? "2F5496" :
+                                hi == "2" ? "2F5496" :
+                                hi == "3" ? "1F3763" :
+                                hi == "4" ? "1F3763" :
+                                throw new UnexpectedValueException(hi);
+
+                            var themeShade = hi == "1" ? "BF" :
+                                hi == "2" ? "BF" :
+                                hi == "3" ? "7F" :
+                                hi == "4" ? "7F" :
+                                throw new UnexpectedValueException(hi);
+
+                            headingStyle = new Style(
+                             new StyleName() { Val = "heading " + hi },
+                             new BasedOn() { Val = "Standard" },
+                             new NextParagraphStyle() { Val = "Standard" },
+                             //new LinkedStyle() { Val = "berschrift1Zchn" },
+                             new UIPriority() { Val = 9 },
+                             new PrimaryStyle(),
+                             new StyleParagraphProperties(
+                                 new KeepNext(),
+                                 new KeepLines(),
+                                 new SpacingBetweenLines() { Before = hi == "1" ? "240" : "40", After = "0" },
+                                 new OutlineLevel() { Val = int.Parse(hi) -1 }),
+                             new StyleRunProperties(
+                                 new RunFonts() { AsciiTheme = ThemeFontValues.MajorHighAnsi, HighAnsiTheme = ThemeFontValues.MajorHighAnsi, EastAsiaTheme = ThemeFontValues.MajorEastAsia, ComplexScriptTheme = ThemeFontValues.MajorBidi },
+                                 new Color() { Val = color, ThemeColor = ThemeColorValues.Accent1, ThemeShade = themeShade },
+                                 new FontSize() { Val = size },
+                                 new FontSizeComplexScript() { Val = size }
+                             )
+                             )
+                            { Type = StyleValues.Paragraph, StyleId = "berschrift" + hi };
+
+                            styles.Styles.InsertAfter(headingStyle,
+                                styles.Styles!.Elements<Style>().LastOrDefault(a => a.StyleName?.Val?.Value?.StartsWith("heading ") == true) ?? 
+                                styles.Styles.Elements<Style>().LastOrDefault()
+                                );
+                            styles.Styles.Save(styles);
+                        }
+                    }
+
+
+                    var pp = new ParagraphProperties
+                    {
+                        ParagraphStyleId = new ParagraphStyleId { Val = headingStyle.StyleId }
+                    };
+                    var childrens = htmlNode.ChildNodes.SelectMany(c => HtmlToWordPrivate(c, null, null, document)).ToList();
+                    childrens.Insert(0, pp);
+                    return new[] { new Paragraph(childrens) };
+
+                }
+
+            case "ul":
+            case "ol":
+                {
+                    var mainDocument = document.GetPartsOfType<MainDocumentPart>().SingleEx();
+
+                    int numberId; 
+                    {
+                        var numberings = mainDocument.GetPartsOfType<NumberingDefinitionsPart>().FirstOrDefault();
+
+                        if (numberings == null)
+                        {
+                            numberings = mainDocument.AddNewPart<NumberingDefinitionsPart>();
+                            numberings.Numbering = new Numbering();
+                        }
+
+                        int abstractId = (numberings.Numbering.Elements<AbstractNum>().Max(a => a.AbstractNumberId?.Value) ?? 0) + 1;
+                        numberId = (numberings.Numbering.Elements<NumberingInstance>().Max(a => a.NumberID?.Value) ?? 0) + 1;
+
+                        numberings.Numbering.InsertAfter(new AbstractNum(
+                            new Level(
+                                new StartNumberingValue { Val = 1 },
+                                new NumberingFormat() { Val = htmlNode.Name == "ul" ? NumberFormatValues.Bullet : NumberFormatValues.Decimal },
+                                new LevelText() { Val = htmlNode.Name == "ul" ? "" : "%1." },
+                                new PreviousParagraphProperties(new Indentation() { Left = "720", Hanging = "360" }),
+                                htmlNode.Name == "ul" ? new NumberingSymbolRunProperties(new RunFonts() { Hint = FontTypeHintValues.Default, Ascii = "Symbol", HighAnsi = "Symbol" }) : null!
+                                )
+                            { LevelIndex = 0 })
+                        { AbstractNumberId = abstractId },
+                          numberings.Numbering.OfType<AbstractNum>().LastOrDefault()
+                        );
+
+                        numberings.Numbering.InsertAfter(
+                            new NumberingInstance(new AbstractNumId() { Val = abstractId }) { NumberID = numberId },
+                            (OpenXmlElement?)numberings.Numbering.Elements<NumberingInstance>().LastOrDefault() ??
+                            numberings.Numbering.Elements<AbstractNum>().LastOrDefault()
+                            );
+
+                        numberings.Numbering.Save(numberings);
+                    }
+
+                    Style listParagraph; 
+                    {
+                        var styles = mainDocument.GetPartsOfType<StyleDefinitionsPart>().FirstOrDefault();
+                        if (styles == null)
+                        {
+                            styles = mainDocument.AddNewPart<StyleDefinitionsPart>();
+                            styles.Styles = new Styles();
+                        }
+
+                        listParagraph = styles.Styles!.ChildElements.OfType<Style>().FirstOrDefault(a => a.StyleName?.Val == "List Paragraph")!;
+
+                        if(listParagraph == null)
+                        {
+                            listParagraph = new Style(
+                               new StyleName() { Val = "List Paragraph" },
+                               new BasedOn() { Val = "Standard" },
+                               new UIPriority() { Val = 34 },
+                               new PrimaryStyle(),
+                               new StyleParagraphProperties(
+                                   new Indentation() { Left = "720" },
+                                   new ContextualSpacing()
+                               )
+                           )
+                            { Type = StyleValues.Paragraph, StyleId = "Listenabsatz" };
+
+                            styles.Styles.Append(listParagraph);
+                            styles.Styles.Save(styles);
+                        }
+                    }
+
+                    var childrens = htmlNode.ChildNodes.SelectMany(c => HtmlToWordPrivate(c, addRunProperties, addParagraphProperties + ((ParagraphProperties pp) =>
+                    {
+                        pp.NumberingProperties = new NumberingProperties
+                        {
+                            NumberingLevelReference = new NumberingLevelReference { Val = 0 },
+                            NumberingId = new NumberingId { Val = numberId }
+                        };
+                        pp.ParagraphStyleId = new ParagraphStyleId { Val = listParagraph.StyleId };
+                    }), document));
+
+                    return childrens;
+                }
             case "#text":
                 var runProperties = new RunProperties();
                 addRunProperties?.Invoke(runProperties);
+
+                var text = HttpUtility.HtmlDecode(htmlNode.InnerText);
 
                 return new[]
                 {
-                     new Run(runProperties, new DocumentFormat.OpenXml.Wordprocessing.Text(htmlNode.InnerText)
+                     new Run(runProperties, new DocumentFormat.OpenXml.Wordprocessing.Text(text)
                      {
                           Space =  SpaceProcessingModeValues.Preserve,
                      })
                 };
 
-            default:
-                throw new UnexpectedValueException(htmlNode.Name);
+            default:
+                //throw new UnexpectedValueException(htmlNode.Name);
+                return htmlNode.ChildNodes.SelectMany(c => HtmlToWordPrivate(c, addRunProperties + ((RunProperties rp) =>
+                {
+                }), addParagraphProperties, document));
         }
-
+
+
+        
     }
 }
diff --git a/Signum.Engine.Extensions/Word/WordModelLogic.cs b/Signum.Engine.Extensions/Word/WordModelLogic.cs
index 83f2b5d3d5..37966657ad 100644
--- a/Signum.Engine.Extensions/Word/WordModelLogic.cs
+++ b/Signum.Engine.Extensions/Word/WordModelLogic.cs
@@ -3,24 +3,27 @@
 using Signum.Engine.Templating;
 using Signum.Entities.Templating;
 using Signum.Entities.Basics;
+using DocumentFormat.OpenXml.Packaging;
 
 namespace Signum.Engine.Word;
 
 public class WordTemplateParameters : TemplateParameters
 {
     public WordTemplateParameters(IEntity? entity, CultureInfo culture, Dictionary<QueryToken, ResultColumn> columns, 
-        IEnumerable<ResultRow> rows, WordTemplateEntity template, IWordModel? wordModel) : 
+        IEnumerable<ResultRow> rows, WordTemplateEntity template, IWordModel? wordModel, OpenXmlPackage document) : 
           base(entity, culture, columns, rows)
     {
         this.Template = template;
         this.Model = wordModel;
-
+        this.Document = document;
     }
 
     public IWordModel? Model;
 
     public WordTemplateEntity Template;
 
+    public OpenXmlPackage Document;
+
     public TokenNode? CurrentTokenNode; //To copy properties
 
     public override object GetModel()
@@ -266,8 +269,8 @@ public static WordTemplateEntity GetDefaultTemplate(WordModelEntity model, Entit
         return GetTemplate(candidates, model, ci) ??
             GetTemplate(candidates, model, CultureInfo.CurrentCulture.Parent) ??
             candidates.SingleEx(
-                () => $"No active WordTemplate for {registeredWordModels} in {CultureInfo.CurrentCulture} or {CultureInfo.CurrentCulture.Parent}",
-                () => $"More than one active WordTemplate for {registeredWordModels} in {CultureInfo.CurrentCulture} or {CultureInfo.CurrentCulture.Parent}");
+                () => $"No active WordTemplate for {model} in {CultureInfo.CurrentCulture} or {CultureInfo.CurrentCulture.Parent}",
+                () => $"More than one active WordTemplate for {model} in {CultureInfo.CurrentCulture} or {CultureInfo.CurrentCulture.Parent}");
     }
 
     private static WordTemplateEntity? GetTemplate(IEnumerable<WordTemplateEntity> candidates, WordModelEntity model, CultureInfo culture)
diff --git a/Signum.Engine.Extensions/Word/WordTemplateRenderer.cs b/Signum.Engine.Extensions/Word/WordTemplateRenderer.cs
index 8cf50d2aef..1b3038fa1f 100644
--- a/Signum.Engine.Extensions/Word/WordTemplateRenderer.cs
+++ b/Signum.Engine.Extensions/Word/WordTemplateRenderer.cs
@@ -74,7 +74,7 @@ internal void ExecuteQuery()
 
     internal void RenderNodes()
     {
-        var parameters = new WordTemplateParameters(this.entity, this.culture, this.dicTokenColumn!, this.table!.Rows, template, model);
+        var parameters = new WordTemplateParameters(this.entity, this.culture, this.dicTokenColumn!, this.table!.Rows, template, model, document);
         
         foreach (var part in document.AllParts().Where(p => p.RootElement != null))
         {
diff --git a/Signum.Entities.Extensions/Alerts/Alert.cs b/Signum.Entities.Extensions/Alerts/Alert.cs
index 3e6374de00..8b0a983f68 100644
--- a/Signum.Entities.Extensions/Alerts/Alert.cs
+++ b/Signum.Entities.Extensions/Alerts/Alert.cs
@@ -9,6 +9,9 @@ public class AlertEntity : Entity
     [ImplementedByAll]
     public Lite<Entity>? Target { get; set; }
 
+    [ImplementedByAll]
+    public Lite<Entity>? ParentTarget { get; set; }
+
     public DateTime CreationDate { get; private set; } = Clock.Now;
 
     [NotNullValidator]
diff --git a/Signum.React.Extensions/Alerts/AlertsClient.tsx b/Signum.React.Extensions/Alerts/AlertsClient.tsx
index a705f3913d..a4507fe700 100644
--- a/Signum.React.Extensions/Alerts/AlertsClient.tsx
+++ b/Signum.React.Extensions/Alerts/AlertsClient.tsx
@@ -63,10 +63,14 @@ export function start(options: { routes: JSX.Element[], showAlerts?: (typeName:
       return undefined;
 
     var alert: Partial<AlertEntity> = {
+      createdBy: ctx.row.columns[ctx.columns.indexOf(AlertEntity.token(a => a.createdBy).toString())],
+      creationDate: ctx.row.columns[ctx.columns.indexOf(AlertEntity.token(a => a.creationDate).toString())],
+      alertDate: ctx.row.columns[ctx.columns.indexOf(AlertEntity.token(a => a.alertDate).toString())],
       target: ctx.row.columns[ctx.columns.indexOf(AlertEntity.token(a => a.target).toString())],
+      parentTarget: ctx.row.columns[ctx.columns.indexOf(AlertEntity.token(a => a.parentTarget).toString())],
       textArguments: ctx.row.columns[ctx.columns.indexOf(AlertEntity.token(a => a.entity.textArguments).toString())]
     };
-    return  formatText(cell, alert);
+    return formatText(cell, alert);
   });
 
   Finder.registerPropertyFormatter(PropertyRoute.tryParse(AlertEntity, "Text"), cellFormatter);
@@ -75,6 +79,7 @@ export function start(options: { routes: JSX.Element[], showAlerts?: (typeName:
     queryName: AlertEntity,
     hiddenColumns: [
       { token: AlertEntity.token(a => a.target) },
+      { token: AlertEntity.token(a => a.parentTarget) },
       { token: AlertEntity.token(a => a.entity.textArguments) }
     ],
     formatters: {
@@ -83,6 +88,8 @@ export function start(options: { routes: JSX.Element[], showAlerts?: (typeName:
   })
 }
 
+
+
 function chooseDate(): Promise<DateTime | undefined> {
   return SelectorModal.chooseElement(DelayOption.values(), {
     title: AlertMessage.DelayDuration.niceToString(),
diff --git a/Signum.React.Extensions/Alerts/Signum.Entities.Alerts.ts b/Signum.React.Extensions/Alerts/Signum.Entities.Alerts.ts
index 132a5077d1..3e8a607cb9 100644
--- a/Signum.React.Extensions/Alerts/Signum.Entities.Alerts.ts
+++ b/Signum.React.Extensions/Alerts/Signum.Entities.Alerts.ts
@@ -24,6 +24,7 @@ export const AlertEntity = new Type<AlertEntity>("Alert");
 export interface AlertEntity extends Entities.Entity {
   Type: "Alert";
   target: Entities.Lite<Entities.Entity> | null;
+  parentTarget: Entities.Lite<Entities.Entity> | null;
   creationDate: string /*DateTime*/;
   alertDate: string /*DateTime*/ | null;
   attendedDate: string /*DateTime*/ | null;
diff --git a/Signum.React.Extensions/Authorization/ActiveDirectoryClient.tsx b/Signum.React.Extensions/Authorization/ActiveDirectoryClient.tsx
index 8f77f73496..a9f3a98f50 100644
--- a/Signum.React.Extensions/Authorization/ActiveDirectoryClient.tsx
+++ b/Signum.React.Extensions/Authorization/ActiveDirectoryClient.tsx
@@ -31,9 +31,14 @@ export function start(options: { routes: JSX.Element[] }) {
     var sid =
       (UserEntity.isLite(u)) ? (u.model as UserLiteModel).sID :
         tryGetMixin(u, UserADMixin)?.sID;
-    
-    return sid == null ? null : AppContext.toAbsoluteUrl("~/api/adThumbnailphoto/" +
-      UserEntity.isLite(u) ? ((u as Lite<UserEntity>).model as UserLiteModel).userName : (u as UserEntity).userName);
+    if (sid == null)
+      return null;
+    var url = "";
+    if (UserEntity.isLite(u))
+      url = AppContext.toAbsoluteUrl("~/api/adThumbnailphoto/" + ((u as Lite<UserEntity>).model as UserLiteModel)?.userName);
+    else
+      url = AppContext.toAbsoluteUrl("~/api/adThumbnailphoto/" + (u as UserEntity).userName);
+    return url;
   });
 
   Navigator.addSettings(new Navigator.EntitySettings(ADGroupEntity, e => import('./AzureAD/ADGroup'), { isCreable: "Never" }));
diff --git a/Signum.React.Extensions/Authorization/ActiveDirectoryController.cs b/Signum.React.Extensions/Authorization/ActiveDirectoryController.cs
index 326383d626..fc9030a65d 100644
--- a/Signum.React.Extensions/Authorization/ActiveDirectoryController.cs
+++ b/Signum.React.Extensions/Authorization/ActiveDirectoryController.cs
@@ -1,72 +1,73 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Mvc;
-using Signum.Engine.Authorization;
-using Signum.Entities.Authorization;
-using Signum.React.Filters;
-using System.Threading.Tasks;
-using System.Threading;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using Signum.Engine.Authorization;
+using Signum.Entities.Authorization;
+using Signum.React.Filters;
+using System.Threading.Tasks;
+using System.Threading;
 using System.Linq;
 using System.IO;
 using Microsoft.AspNetCore.Http;
 
-namespace Signum.React.Authorization;
-
-[ValidateModelFilter]
-public class ActiveDirectoryController : ControllerBase
-{
-    [HttpGet("api/findADUsers")]
-    public Task<List<ActiveDirectoryUser>> FindADUsers(string subString, int count, CancellationToken token)
+namespace Signum.React.Authorization;
+
+[ValidateModelFilter]
+public class ActiveDirectoryController : ControllerBase
+{
+    [HttpGet("api/findADUsers")]
+    public Task<List<ActiveDirectoryUser>> FindADUsers(string subString, int count, CancellationToken token)
     {
         ActiveDirectoryPermission.InviteUsersFromAD.AssertAuthorized();
-
-        var config = ((ActiveDirectoryAuthorizer)AuthLogic.Authorizer!).GetConfig();
-        if (config.Azure_ApplicationID != null)
-            return AzureADLogic.FindActiveDirectoryUsers(subString, count, token);
-
-        if (config.DomainName.HasText())
-            return ActiveDirectoryLogic.SearchUser(subString);
-
-        throw new InvalidOperationException($"Neither {nameof(config.Azure_ApplicationID)} or {nameof(config.DomainName)} are set in {config.GetType().Name}");
-    }
-
-
-    [HttpPost("api/createADUser")]
-    public Lite<UserEntity> CreateADUser([FromBody][Required] ActiveDirectoryUser user)
+
+        var config = ((ActiveDirectoryAuthorizer)AuthLogic.Authorizer!).GetConfig();
+        if (config.Azure_ApplicationID != null)
+            return AzureADLogic.FindActiveDirectoryUsers(subString, count, token);
+
+        if (config.DomainName.HasText())
+            return ActiveDirectoryLogic.SearchUser(subString);
+
+        throw new InvalidOperationException($"Neither {nameof(config.Azure_ApplicationID)} or {nameof(config.DomainName)} are set in {config.GetType().Name}");
+    }
+
+
+    [HttpPost("api/createADUser")]
+    public Lite<UserEntity> CreateADUser([FromBody][Required] ActiveDirectoryUser user)
     {
         ActiveDirectoryPermission.InviteUsersFromAD.AssertAuthorized();
-
-        var config = ((ActiveDirectoryAuthorizer)AuthLogic.Authorizer!).GetConfig();
-
-        if (config.Azure_ApplicationID != null)
-            return AzureADLogic.CreateUserFromAD(user).ToLite();
-
-        if (config.DomainName.HasText())
-            return ActiveDirectoryLogic.CreateUserFromAD(user).ToLite();
-
-        throw new InvalidOperationException($"Neither {nameof(config.Azure_ApplicationID)} or {nameof(config.DomainName)} are set in {config.GetType().Name}");
-    }
-
-
-    [HttpPost("api/createADGroup")]
-    public Lite<ADGroupEntity> CreateADGroup([FromBody][Required] ADGroupRequest groupRequest)
+
+        var config = ((ActiveDirectoryAuthorizer)AuthLogic.Authorizer!).GetConfig();
+
+        if (config.Azure_ApplicationID != null)
+            return AzureADLogic.CreateUserFromAD(user).ToLite();
+
+        if (config.DomainName.HasText())
+            return ActiveDirectoryLogic.CreateUserFromAD(user).ToLite();
+
+        throw new InvalidOperationException($"Neither {nameof(config.Azure_ApplicationID)} or {nameof(config.DomainName)} are set in {config.GetType().Name}");
+    }
+
+
+    [HttpPost("api/createADGroup")]
+    public Lite<ADGroupEntity> CreateADGroup([FromBody][Required] ADGroupRequest groupRequest)
     {
         ActiveDirectoryPermission.InviteUsersFromAD.AssertAuthorized();
-
-        var group = Database.Query<ADGroupEntity>().SingleOrDefault(a => a.Id == groupRequest.Id);
-        if (group != null)
-            return group.ToLite();
-
-        group = new ADGroupEntity
-        {
-            DisplayName = groupRequest.DisplayName,
-        }.SetId(groupRequest.Id);
-
-        return group.Execute(ADGroupOperation.Save).ToLite();
+
+        var group = Database.Query<ADGroupEntity>().SingleOrDefault(a => a.Id == groupRequest.Id);
+        if (group != null)
+            return group.ToLite();
+
+        group = new ADGroupEntity
+        {
+            DisplayName = groupRequest.DisplayName,
+        }.SetId(groupRequest.Id);
+
+        return group.Execute(ADGroupOperation.Save).ToLite();
     }
 
     public static TimeSpan PictureMaxAge = new TimeSpan(7, 0, 0);
 
 
+   
     [HttpGet("api/adThumbnailphoto/{username}"), SignumAllowAnonymous]
     public FileStreamResult? GetThumbnail(string username)
     {
@@ -113,10 +114,10 @@ public Task<ActionResult> GetUserPhoto(string oId, int size)
             return new FileStreamResult(photo, "image/jpeg");
         });
     }
-
-    public class ADGroupRequest
-    {
-        public Guid Id; 
-        public string DisplayName;
-    }
-}
+
+    public class ADGroupRequest
+    {
+        public Guid Id; 
+        public string DisplayName;
+    }
+}
diff --git a/Signum.React.Extensions/Authorization/AuthAdminClient.tsx b/Signum.React.Extensions/Authorization/AuthAdminClient.tsx
index 0251ecf6d1..56845a9114 100644
--- a/Signum.React.Extensions/Authorization/AuthAdminClient.tsx
+++ b/Signum.React.Extensions/Authorization/AuthAdminClient.tsx
@@ -41,7 +41,7 @@ export function start(options: { routes: JSX.Element[], types: boolean; properti
     renderLite: (lite, subStr) => {
       if (UserLiteModel.isInstance(lite.model))
         return (
-          <span className="d-inline-flex align-items-center"><SmallProfilePhoto user={lite} className="me-2" /><span>{TypeaheadOptions.highlightedText(getToString(lite), subStr)}</span></span>
+          <span className="d-inline-flex align-items-center"><SmallProfilePhoto user={lite} className="me-1" /><span>{TypeaheadOptions.highlightedText(getToString(lite), subStr)}</span></span>
         );
 
       if (typeof lite.model == "string")
diff --git a/Signum.React.Extensions/Authorization/Templates/ProfilePhoto.css b/Signum.React.Extensions/Authorization/Templates/ProfilePhoto.css
index 84114d3975..ecce4db6e8 100644
--- a/Signum.React.Extensions/Authorization/Templates/ProfilePhoto.css
+++ b/Signum.React.Extensions/Authorization/Templates/ProfilePhoto.css
@@ -6,6 +6,7 @@
 
 .user-profile-photo img {
     object-fit: cover;
+    width: 100%;
     border-radius: 50% !important;
 }
 
diff --git a/Signum.React.Extensions/Authorization/Templates/ProfilePhoto.tsx b/Signum.React.Extensions/Authorization/Templates/ProfilePhoto.tsx
index a6c54a8ef1..1e1ce45b96 100644
--- a/Signum.React.Extensions/Authorization/Templates/ProfilePhoto.tsx
+++ b/Signum.React.Extensions/Authorization/Templates/ProfilePhoto.tsx
@@ -1,53 +1,59 @@
 import React, { useEffect, useState } from "react";
 import { UserEntity } from "../Signum.Entities.Authorization";
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import './ProfilePhoto.css'
-import { getToString, Lite } from "@framework/Signum.Entities";
-import UserCircle from "./UserCircle";
-import { classes } from "@framework/Globals";
-
-export var urlProviders: ((u: UserEntity | Lite<UserEntity>, size: number) => string | null)[] = []; 
+import { getToString, Lite, toLite } from "@framework/Signum.Entities";
+import UserCircle from "./UserCircle";
+import * as UserCircles from "./UserCircle";
+import { classes } from "@framework/Globals";
 
-export default function ProfilePhoto(p: { user: UserEntity | Lite<UserEntity>, size: number }) {
-  const [immageError, setImageError] = useState(false);
-
-  var url = urlProviders.map(f => f(p.user, p.size)).notNull().firstOrNull(); 
-
-  useEffect(() => {
-    setImageError(false);
-  }, [url]);
+export var urlProviders: ((u: UserEntity | Lite<UserEntity>, size: number) => string | null)[] = []; 
+
+export default function ProfilePhoto(p: { user: UserEntity, size: number }) {
+  const [imageError, setImageError] = useState(false);
+
+  var url = urlProviders.map(f => f(p.user, p.size)).notNull().firstOrNull(); 
+
+  useEffect(() => {
+    setImageError(false);
+  }, [url]);
+
+  if (imageError)
+    url = null;
 
   function addDefaultSrc(ev: any) {
     setImageError(true);
   }
-
+
+  var color = p.user == null ? "gray" : UserCircles.Options.getUserColor(toLite(p.user));
+
   var iconSize = p.size >= 250 ? "10x" : `${Math.ceil(p.size / 25)}x`;
   return (
-    <div className="user-profile-photo align-items-center d-flex justify-content-center" style={{ width: `${p.size}px`, height: `${p.size}px` }}>
-      {!url || immageError ? <FontAwesomeIcon icon="user" size={iconSize as any} color="gray" /> :
+    <div className="user-profile-photo align-items-center d-flex justify-content-center" style={{ width: `${p.size}px`, height: `${p.size}px`, borderColor: !url ? color : undefined }}>
+      {!url ? <FontAwesomeIcon icon="user" size={iconSize as any} color={color} /> :
         <img src={url} style={{ maxWidth: `${p.size - 3}px`, maxHeight: `${p.size - 3}px` }} onError={addDefaultSrc} />}
     </div>
   );
-}
-
+}
+
 export function SmallProfilePhoto(p: { user: Lite<UserEntity>, size?: number, className?: string }) {
-  const [immageError, setImageError] = useState(false);
-  var size = p.size ?? 22;
-
-  var url = urlProviders.map(f => f(p.user, size!)).notNull().firstOrNull();
-
-  useEffect(() => {
-    setImageError(false);
-  }, [url]);
+  const [immageError, setImageError] = useState(false);
+  var size = p.size ?? 22;
+
+  var url = urlProviders.map(f => f(p.user, size!)).notNull().firstOrNull();
+
+  useEffect(() => {
+    setImageError(false);
+  }, [url]);
 
   function addDefaultSrc(ev: any) {
     setImageError(true);
   }
-
+
   return (
-    <div className={classes("d-inline-flex small-user-profile-photo align-items-center justify-content-center", p.className)}>
-      {url && !immageError ? <img src={url} style={{ maxWidth: `${size}px`, maxHeight: `${size}px` }} onError={addDefaultSrc} title={getToString(p.user)} /> :
-        p.user ? <UserCircle user={p.user} /> : <FontAwesomeIcon icon="user" color="gray" />}
+    <div className={classes("small-user-profile-photo", p.className)}>
+      {url && !immageError ? <img src={url} style={{ maxWidth: `${size}px`, maxHeight: `${size}px` }} onError={addDefaultSrc} title={getToString(p.user)} /> :
+        <UserCircle user={p.user} />}
     </div>
   );
-}
+}
diff --git a/Signum.React.Extensions/Authorization/Templates/User.tsx b/Signum.React.Extensions/Authorization/Templates/User.tsx
index be8318a717..38bfe8c3fe 100644
--- a/Signum.React.Extensions/Authorization/Templates/User.tsx
+++ b/Signum.React.Extensions/Authorization/Templates/User.tsx
@@ -45,7 +45,6 @@ export default function User(p: { ctx: TypeContext<UserEntity> }) {
               return AuthAdminClient.API.trivialMergeRole(rs);
             })} />
       	
-
             <ValueLine ctx={ctx.subCtx(e => e.email)} readOnly={User.emailReadonly(ctx.value) ? true : undefined} />
             <EntityCombo ctx={ctx.subCtx(e => e.cultureInfo)} />
         </div>
diff --git a/Signum.React.Extensions/Authorization/Templates/UserCircle.tsx b/Signum.React.Extensions/Authorization/Templates/UserCircle.tsx
index 824e74df0c..3c945c8330 100644
--- a/Signum.React.Extensions/Authorization/Templates/UserCircle.tsx
+++ b/Signum.React.Extensions/Authorization/Templates/UserCircle.tsx
@@ -23,7 +23,12 @@ export function getUserInitials(u: Lite<UserEntity>): string {
 export default function UserCircle(p: { user: Lite<UserEntity>, className?: string }) {
   var color = Options.getUserColor(p.user);
   return (
-    <span className={classes("user-circle", p.className)} style={{ color: "white", backgroundColor: color }} title={getToString(p.user)}>
+    <span className={classes("user-circle", p.className)} style={{
+      color: "white",
+      textDecoration: "underline",
+      textDecorationColor: color,
+      backgroundColor: color
+    }} title={getToString(p.user)}>
       {getUserInitials(p.user)}
     </span>
   );
diff --git a/Signum.React.Extensions/Scheduler/SchedulerClient.tsx b/Signum.React.Extensions/Scheduler/SchedulerClient.tsx
index 071b86bea2..f8abb75e95 100644
--- a/Signum.React.Extensions/Scheduler/SchedulerClient.tsx
+++ b/Signum.React.Extensions/Scheduler/SchedulerClient.tsx
@@ -3,10 +3,11 @@ import * as React from 'react'
 import { ajaxPost, ajaxGet } from '@framework/Services';
 import { EntitySettings } from '@framework/Navigator'
 import * as Navigator from '@framework/Navigator'
+import * as Operations from '@framework/Operations'
 import { Lite } from '@framework/Signum.Entities'
 import {
   ScheduledTaskLogEntity, ScheduledTaskEntity, ScheduleRuleMinutelyEntity, ScheduleRuleMonthsEntity,
-  ScheduleRuleWeekDaysEntity, HolidayCalendarEntity, SchedulerPermission, SchedulerTaskExceptionLineEntity
+  ScheduleRuleWeekDaysEntity, HolidayCalendarEntity, SchedulerPermission, SchedulerTaskExceptionLineEntity, ITaskOperation, ITaskMessage
 } from './Signum.Entities.Scheduler'
 import * as OmniboxClient from '../Omnibox/OmniboxClient'
 import * as AuthClient from '../Authorization/AuthClient'
@@ -22,6 +23,23 @@ export function start(options: { routes: JSX.Element[] }) {
   Navigator.addSettings(new EntitySettings(ScheduleRuleMonthsEntity, e => import('./Templates/ScheduleRuleMonths')));
   Navigator.addSettings(new EntitySettings(HolidayCalendarEntity, e => import('./Templates/HolidayCalendar')));
 
+  var group: Operations.EntityOperationGroup = {
+    key: "execute",
+    text: () => ITaskMessage.Execute.niceToString()
+  };
+
+  Operations.addSettings(new Operations.EntityOperationSettings(ITaskOperation.ExecuteAsync, {
+    icon: "hourglass-half",
+    iconColor: "#5499C7",
+    group: group
+  }));
+
+  Operations.addSettings(new Operations.EntityOperationSettings(ITaskOperation.ExecuteSync, {
+    icon: "bolt",
+    iconColor: "#F1C40F",
+    group: group
+  }));
+
   OmniboxClient.registerSpecialAction({
     allowed: () => AuthClient.isPermissionAuthorized(SchedulerPermission.ViewSchedulerPanel),
     key: "SchedulerPanel",
diff --git a/Signum.React.Extensions/UserAssets/Templates/QueryTokenEmbeddedBuilder.tsx b/Signum.React.Extensions/UserAssets/Templates/QueryTokenEmbeddedBuilder.tsx
index 37117bf378..1826158d8f 100644
--- a/Signum.React.Extensions/UserAssets/Templates/QueryTokenEmbeddedBuilder.tsx
+++ b/Signum.React.Extensions/UserAssets/Templates/QueryTokenEmbeddedBuilder.tsx
@@ -7,7 +7,7 @@ import QueryTokenBuilder from '@framework/SearchControl/QueryTokenBuilder'
 import { useForceUpdate } from '@framework/Hooks'
 
 interface QueryTokenEmbeddedBuilderProps {
-  ctx: TypeContext<QueryTokenEmbedded | null | undefined>;
+  ctx: TypeContext<QueryTokenEmbedded | null>;
   queryKey: string;
   subTokenOptions: SubTokensOptions;
   onTokenChanged?: (newToken: QueryToken | undefined) => void;
@@ -17,8 +17,8 @@ interface QueryTokenEmbeddedBuilderProps {
 export default function QueryTokenEntityBuilder(p: QueryTokenEmbeddedBuilderProps) {
   const forceUpdate = useForceUpdate();
   function handleTokenChanged(newToken: QueryToken | undefined) {
-    if (newToken == undefined)
-      p.ctx.value = undefined;
+    if (newToken == null)
+      p.ctx.value = null;
     else
       p.ctx.value = QueryTokenEmbedded.New({
         tokenString: newToken.fullKey,
diff --git a/Signum.React/Scripts/AppContext.tsx b/Signum.React/Scripts/AppContext.tsx
index ac6fa63f9c..8d502b9b3f 100644
--- a/Signum.React/Scripts/AppContext.tsx
+++ b/Signum.React/Scripts/AppContext.tsx
@@ -114,7 +114,7 @@ export function toAbsoluteUrl(appRelativeUrl: string): string {
   if (appRelativeUrl?.startsWith(relativeCrappyUrl))
     return window.__baseUrl + appRelativeUrl.after(relativeCrappyUrl);
 
-  if (appRelativeUrl.startsWith(window.__baseUrl) || appRelativeUrl.startsWith("http"))
+  if (appRelativeUrl?.startsWith(window.__baseUrl) || appRelativeUrl?.startsWith("http"))
     return appRelativeUrl;
 
   return appRelativeUrl;
diff --git a/Signum.React/Scripts/Operations/CellOperation.tsx b/Signum.React/Scripts/Operations/CellOperation.tsx
index 0eeb871ba4..87af4f8d13 100644
--- a/Signum.React/Scripts/Operations/CellOperation.tsx
+++ b/Signum.React/Scripts/Operations/CellOperation.tsx
@@ -16,6 +16,7 @@ import { BsColor } from "../Components";
 import Exception from "../Exceptions/Exception";
 import { withIcon } from "./EntityOperations";
 import { CellFormatter } from "../Finder";
+import { useDoubleClick } from "../Hooks";
 
 
 export interface CellOperationProps extends ButtonProps {
@@ -70,13 +71,15 @@ export function CellOperationButton({ coc: cocOrNull, onOperationClick, outline,
       .done();
   }
 
+  const onlySingleClick = useDoubleClick((e) => { }, handleOnClick);
+
   var button = <Button variant={(outline ? ("outline-" + color) : color)}
     {...props}
     key="button"
     size="sm"
     title={coc.operationInfo.niceName}
     className={classes(disabled ? "disabled" : undefined, props?.className, coc.settings && coc.settings.classes)}
-    onClick={disabled ? undefined : handleOnClick}
+    onClick={disabled ? undefined : onlySingleClick}
     data-operation={coc.operationInfo.key}>
     {renderChildren()}
   </Button>;
diff --git a/Signum.React/Scripts/Operations/MultiPropertySetter.tsx b/Signum.React/Scripts/Operations/MultiPropertySetter.tsx
index 5ac4c5b561..f2b7a0408c 100644
--- a/Signum.React/Scripts/Operations/MultiPropertySetter.tsx
+++ b/Signum.React/Scripts/Operations/MultiPropertySetter.tsx
@@ -242,8 +242,7 @@ export function PropertySetterComponent(p: PropertySetterComponentProps) {
     p.setters = p.operation && showSetters(p.operation) ? [] : undefined;
     if (pr && (p.setters || p.predicate)) {
       var infos = tryGetTypeInfos(pr.typeReference());
-      var promise = infos.length == 1 && infos[0] ? Promise.resolve(undefined) :
-        SelectorModal.chooseType(infos.notNull().filter(tr => tr!.entityKind == "Part" || tr!.entityKind == "SharedPart"));
+      var promise = SelectorModal.chooseType(infos.notNull().filter(tr => tr!.entityKind == "Part" || tr!.entityKind == "SharedPart"));
 
       return promise.then(type => { p.entityType = type?.name; });
     }
@@ -261,8 +260,8 @@ export function PropertySetterComponent(p: PropertySetterComponentProps) {
   var fOperations = filterType ? filterOperations[filterType] : null;
 
   var subRoot = pr &&
-    (pr.typeReference().isCollection ? (pr.typeReference().isEmbedded ? pr.addMember("Indexer", "Item", true) : PropertyRoute.root(getTypeInfo(pr.typeReference().name))):
-      p.setter.entityType != null ? PropertyRoute.root(getTypeInfo(p.setter.entityType)) : null);;
+    (pr.typeReference().isCollection ? (pr.typeReference().isEmbedded ? pr.addMember("Indexer", "Item", true) : PropertyRoute.root(getTypeInfo(pr.typeReference().name))) :
+      (pr.typeReference().isEmbedded ? pr : (p.setter.entityType != null ? PropertyRoute.root(getTypeInfo(p.setter.entityType)) : null)));
 
   return (
     <>