WITH cteSection AS
        (
/* OG
          SELECT ROW_NUMBER() OVER (
              PARTITION BY JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_activitycode') 
              Order BY JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_activitycode'),
              JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_section') 
            ) AS RowNum,
            JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_activitycode') AS ActivityCode,
            JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_section') AS SectionNum,
            JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_brochurecode') AS BrochureCode,
            JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_brochuretext') AS ActivityDescription,
            JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_facilitylocation') AS LocationCode,
            JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_displayonweb') AS Display
          FROM AccuRecTrac
          WHERE AccuRecTrac.TableName LIKE 'arsection'
            -- [X] TODO - move to api filter
            AND JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_archived') = 'false'
            --AND JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_displayonweb') LIKE 'Yes' 
*/
          SELECT ROW_NUMBER() OVER (
              PARTITION BY activitycode 
              Order BY activitycode,
                section 
            ) AS RowNum,
            activitycode AS ActivityCode,
            section AS SectionNum,
            brochurecode AS BrochureCode,
            brochuretext AS ActivityDescription,
            facilitylocation AS LocationCode
          FROM AccuRecTrac_arsection
        ),
        cteSectionFilter AS
        (
  /* OG
          SELECT DISTINCT JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_activitycode') AS ActivityCode
          FROM AccuRecTrac
          WHERE AccuRecTrac.TableName LIKE 'arsection'
            -- [X] TODO - move to api filter
            AND JSON_VALUE(AccuRecTrac.DataJSON, '$.arsection_displayonweb') LIKE 'Yes'
  */
          SELECT DISTINCT activitycode AS ActivityCode
          FROM AccuRecTrac_arsection
          WHERE 1 = 1
            
        ),
        cteBrochure AS 
        (
          SELECT JSON_VALUE(AccuRecTrac.DataJSON, '$.sacommentcode_commentcode') AS BrochureCode,
            JSON_VALUE(AccuRecTrac.DataJSON, '$.sacommentcode_comments') AS ActivityDescription
          FROM AccuRecTrac
          WHERE AccuRecTrac.TableName LIKE 'sacommentcode'
        ) 
/* OG    
        SELECT DISTINCT JSON_VALUE(ART.DataJSON, '$.aractivity_activitycode') AS ActivityCode,
          JSON_VALUE(ART.DataJSON, '$.aractivity_shortdescription') AS Title,
          JSON_VALUE(ART.DataJSON, '$.aractivity_typecode') AS TypeCode,
          CASE WHEN Brochure.ActivityDescription IS NOT NULL THEN Brochure.ActivityDescription ELSE SecDesc.ActivityDescription END AS ActivityDescription,
          SecDesc.SectionNum as SectionNum,
          SecDesc.RowNum
        FROM AccuRecTrac AS ART
        INNER JOIN cteSection AS SecDesc ON SecDesc.ActivityCode = JSON_VALUE(ART.DataJSON, '$.aractivity_activitycode')
        LEFT JOIN cteBrochure AS Brochure ON Brochure.BrochureCode = SecDesc.BrochureCode
        -- [] TODO - uncomment as the fallback skip activities with no sections returned will mess with pagination by possibly having less than rpp on a page
        --INNER JOIN cteSectionFilter AS Filter ON Filter.ActivityCode = SecDesc.ActivityCode
        WHERE ART.TableName LIKE 'aractivity'
          -- [X] TODO - move to api filter
          AND JSON_VALUE(ART.DataJSON, '$.aractivity_activitycode') <> ''
          -- [X] TODO - move to api filter
          AND SecDesc.ActivityDescription <> ''
          AND RowNum = 1
          -- [X] TODO - move to api filter
          AND SecDesc.Display LIKE 'Yes'
*/
        SELECT DISTINCT ART.activitycode AS ActivityCode,
          ART.shortdescription AS Title,
          ART.typecode AS TypeCode,
          CASE WHEN Brochure.ActivityDescription IS NOT NULL THEN Brochure.ActivityDescription ELSE SecDesc.ActivityDescription END AS ActivityDescription,
          SecDesc.SectionNum as SectionNum,
          SecDesc.RowNum
        FROM AccuRecTrac_aractivity AS ART
        INNER JOIN cteSection AS SecDesc ON SecDesc.ActivityCode = ART.activitycode
        LEFT JOIN cteBrochure AS Brochure ON Brochure.BrochureCode = SecDesc.BrochureCode
        -- [] TODO - uncomment as the fallback skip activities with no sections returned will mess with pagination by possibly having less than rpp on a page
        INNER JOIN cteSectionFilter AS Filter ON Filter.ActivityCode = SecDesc.ActivityCode
        WHERE SecDesc.RowNum = 1
          AND (/* OG JSON_VALUE(ART.DataJSON, '$.aractivity_typecode') LIKE 'Fitness' */ ART.typecode LIKE 'Fitness')  
/* OG
        ORDER BY JSON_VALUE(ART.DataJSON, '$.aractivity_typecode')
*/
        ORDER BY ART.typecode
        ;