Security and AOR Report: Inactive Assignment Locations Issue

We created a Security and AOR report that provides person roles and areas of responsibility. The expected result is when a user runs this report he should able to see all employees from the location of the user's current active assignments. However, the report is also pulling in employees from the location of the user's inactive assignment which should not be picked. Please help us resolve this issue.

Below attached is the code we developed. Pls have a look over it.