Year over year disability disclosure reports

Our requirement is to provide a report and graph with year over year counts of disability self disclosures. Attached is an xml version of my report. I'm joining the Workforce Management - Workforce Trend Real Time subject area (for Time dimension) with the Workforce Management - Person Real Time subject area (for Person disability dimensions).

If someone disclosed they were disable in 2022 but termed in 2023, they're not showing up on the report because I have to filter terminated assignment status. If I don't filter out terms, it will include every term with disabilities every year after they termed.

If someone is employed in 2022 but doesn't disclose a disability until 2024, they are counting as disabled in 2022. We wouldn't want them to count until 2024 when the disability was disclosed.