Fix issues with refactor on prepare_ward_filter_map_refactor_for_main in order to merge the branch into main

[KyleDolezal]

Overview
This issue is aimed at fixing the functionality associated with a refactor so that the code change is fit to merge into main.

Problem
Commit afe66af, part of branch create-ward-filtering, was not merged in during a recent attempt to merge several commits to main. The code change is rebased and several issues have been addressed, but it breaks functionality on main branch here.

Solution

• Check out the branch here.
• Address issues with the functionality described here.