Add Column Group by

I have the following query to create groups where an entity exists in more than 1 group

ie

User 1, Mobile

User 1, Desktop

=

User 1, Mobile,Desktop

My issue is where I have a different primary groups but the same secondary group it creates the following 

Facebook,Mobile,Mobile
Mobile
Mobile,Desktop
Mobile,Mobile

Where as I want the results grouped like

Facebook,Mobile
Mobile
Mobile,Desktop

Below is the current DAX syntax I am using, can anyone help ?

Thanks in advance

Attributes = ADDCOLUMNS(
GROUPBY(
Control,
Control[UUID]
),
"PrimaryGroup",
CALCULATE(
CONCATENATEX(Control, Control[PrimaryGroup], ","),Control[IsFootfall] = 0),
"SecondaryGroup",
CALCULATE(
CONCATENATEX(Control, Control[SecondaryGroup], ","),Control[IsFootfall] = 0)
)

mcam99

Please Give this a shot

Attributes =
ADDCOLUMNS (
    GROUPBY ( Control, Control[UUID] ),
    "PrimaryGroup", CALCULATE (
        CONCATENATEX ( VALUES ( Control[PrimaryGroup] ), Control[PrimaryGroup], "," ),
        Control[IsFootfall] = 0
    ),
    "SecondaryGroup", CALCULATE (
        CONCATENATEX (
            VALUES ( Control[SecondaryGroup] ),
            Control[SecondaryGroup],
            ","
        ),
        Control[IsFootfall] = 0
    )
)