Request on adding grant name field and current location/phase to filters for reporting!

One partner requested to be able to create reports under record type: follow-up/service with "adding two
minimum reportable field case “grant name” and “if camp, which phase?”
so, would it be possible to work on it or it’s better to add them manually to those two forms?! knowing that two fields already existed in the registration form.

Also, under follow-up/service record type, when we filter by current location, it gives in the resulted report "unidentified as in below
Thanks