PQ - Grouping columns in rows and get data marked by x together

[sandy666]

with M above we achieved what was intended but the problem was that we cannot add additional columns (data, marker) to the source data and achieve the same result without editing the M itself.

so here is source data extended by additional columns

A

A.X

B

B.X

C

C.X

D

D.X

E

E.X

F

F.X

G

G.X

Bob

Sara

Ford

x

item01

aa

h01

x

s0

Joe

x

Mary

x

Fiat

item02

x

bb

x

s1

x

Dean

Cathy

Porsche

x

item03

cc

h02

s2

Mark

GMC

x

item04

x

h03

x

s3

Sergio

x

item05

s4

x

and achieved result without interfering with the source M

Group	Result
A	Joe, Sergio
B	Mary
C	Ford, Porsche, GMC
D	item02, item04
E	bb
F	h01, h03
G	s1, s4

after adding columns, you just need to refresh the result table

// Query1
let
    Source = Excel.CurrentWorkbook(){[Name="Table1"]}[Content],
    TBD = Table.TransformColumns(Table.Transpose(Table.DemoteHeaders(Source)), {{"Column1", each Text.BeforeDelimiter(_, "."), type text}}),
    Grp = Table.Group(TBD, {"Column1"}, {{"A", each Text.Combine([Column2]), type nullable text}, {"B", each Text.Combine([Column3]), type nullable text}, {"C", each Text.Combine([Column4]), type nullable text}, {"D", each Text.Combine([Column5]), type nullable text}, {"E", each Text.Combine([Column6]), type nullable text}}),
    UNP = Table.UnpivotOtherColumns(Table.PromoteHeaders(Table.Transpose(Grp), [PromoteAllScalars=true]), {}, "Group", "Value"),
    Asc = Table.Sort(Table.Group(Table.SelectRows(UNP, each Text.EndsWith([Value], "x")), {"Group"}, {{"All", each _, type table [Group=text, Value=text]}}),{{"Group", Order.Ascending}}),
    TSC = Table.SelectColumns(Table.TransformColumns(Table.AddColumn(Asc, "Data", each [All][Value]), {"Data", each Text.Combine(List.Transform(_, Text.From), ", "), type text}),{"Group", "Data"})
in
    TSC