diff --git a/WeakAuras/Transmission.lua b/WeakAuras/Transmission.lua
index a0248ef..9aa4791 100644
--- a/WeakAuras/Transmission.lua
+++ b/WeakAuras/Transmission.lua
@@ -1229,7 +1229,7 @@ end
 
 function WeakAuras.MatchInfo(data, children, target)
   -- match the parent/single aura (if no children)
-  local oldParent = target or findMatch(data)
+  local oldParent = target or findMatch(data, children)
   if not oldParent then return nil end
   -- setup
   local info = {
diff --git a/WeakAurasOptions/ConditionOptions.lua b/WeakAurasOptions/ConditionOptions.lua
index ffbb00b..528b183 100644
--- a/WeakAurasOptions/ConditionOptions.lua
+++ b/WeakAurasOptions/ConditionOptions.lua
@@ -725,14 +725,23 @@ local function addControlsForChange(args, order, data, conditionVariable, condit
     end
 
     local hasTextFormatOption
+
+    local hidden = function()
+      return WeakAuras.IsCollapsed("format_option", "conditions", i .. "#" .. j , true)
+    end
+
+    local setHidden = function(hidden)
+      WeakAuras.SetCollapsed("format_option", "conditions", i .. "#" .. j, hidden)
+    end
+
     if data.controlledChildren then
       for id, reference in pairs(conditions[i].changes[j].references) do
         local input = reference.value and reference.value.message
-        hasTextFormatOption = WeakAuras.AddTextFormatOption(input, true, formatGet, addOption)
+        hasTextFormatOption = WeakAuras.AddTextFormatOption(input, true, formatGet, addOption, hidden, setHidden)
       end
     else
       local input = type(conditions[i].changes[j].value) == "table" and conditions[i].changes[j].value["message"]
-      hasTextFormatOption = WeakAuras.AddTextFormatOption(input, true, formatGet, addOption)
+      hasTextFormatOption = WeakAuras.AddTextFormatOption(input, true, formatGet, addOption, hidden, setHidden)
     end
 
     if hasTextFormatOption then
diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index ad6d6db..119e8f8 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -1633,12 +1633,12 @@ function WeakAuras.AddTextFormatOption(input, withHeader, get, addOption, hidden
       if sym == "c" or sym == "i" then
         -- No special options for these
       else
-      addOption(symbol .. "desc", {
-        type = "description",
-        name = L["Format for %s"]:format("%" .. symbol),
-        width = WeakAuras.normalWidth,
-        hidden = hidden
-      })
+        addOption(symbol .. "desc", {
+          type = "description",
+          name = L["Format for %s"]:format("%" .. symbol),
+          width = WeakAuras.normalWidth,
+          hidden = hidden
+        })
         addOption(symbol .. "_format", {
           type = "select",
           name = L["Format"],
@@ -1652,10 +1652,9 @@ function WeakAuras.AddTextFormatOption(input, withHeader, get, addOption, hidden
         if (WeakAuras.format_types[selectedFormat]) then
           WeakAuras.format_types[selectedFormat].AddOptions(symbol, hidden, addOption, get)
         end
-
+        seenSymbols[symbol] = true
       end
     end
-    seenSymbols[symbol] = true
   end)
 
   if not next(seenSymbols) and withHeader then