[GS] GS but R&F DLC issue

[ReichAdler]

I have an issue with a civ that uses most buildings & improvements from all civs. It is Atlantis, so fits with the theme.

The issue is I can add Rise & Fall content & use the Expansion_XP1 system to just add them in for R&F users. I can do the same for XP2 GS.

What I cant do is have both lots of improvements for people with both DLCs. Well I can by adding XP1 & XP2 content to the XP2 page, but then people without XP1, but that have XP2 cant load the mod.

Does one of you learned sages have an idea on how to do this?

Currently I am using the below:

 <ActionCriteria>
    <Criteria id="LeaderCAFATL" any="1">
      <LeaderPlayable>Players:StandardPlayers::LEADER_CAF_ATL,StandardPlayers::LEADER_CAF_ATL,Players:Expansion1_Players::LEADER_CAF_ATL,Players:Expansion2_Players::LEADER_CAF_ATL</LeaderPlayable>
            <RuleSetInUse>RULESET_STANDARD,RULESET_EXPANSION_1,RULESET_EXPANSION_2</RuleSetInUse>
    </Criteria>
    <Criteria id="LeaderCAFATL_Expansion1" any="1">
        <LeaderPlayable>Players:Expansion1_Players::LEADER_CAF_ATL</LeaderPlayable>
        <RuleSetInUse>RULESET_EXPANSION_1</RuleSetInUse>
    </Criteria>
    <Criteria id="LeaderCAFATL_Expansion2" any="1">
        <LeaderPlayable>Players:Expansion2_Players::LEADER_CAF_ATL</LeaderPlayable>
        <RuleSetInUse>RULESET_EXPANSION_2</RuleSetInUse>
    </Criteria>
  </ActionCriteria>
 
 
  <InGameActions>

    <UpdateDatabase id="CAFAtlantisGameplay_XP1" criteria="LeaderCAFATL_Expansion1">
            <File>Data/CAF_Atlantis_Expansion1.xml</File>
    </UpdateDatabase>
    <UpdateDatabase id="CAFAtlantisGameplay_XP2" criteria="LeaderCAFATL_Expansion2">
            <File>Data/CAF_Atlantis_Expansion2.xml</File>
    </UpdateDatabase>

I have tried all variations I can think of, enabling options for both rulesets, separate pages for XP1, XP2, XP1&2, but I cant stop XP2 loading the both XP option even if Ruleset1 is not present.

The people of Atlantis need you... well the thousands of users at least Actually I need you, I lost hours trying to get around this & it is keeping me awake at night.