How can we better handle changes in the primary hierarchy of a manager via the admin worker?

When changing a manager's primary hierarchy via admin worker there are two separate issues we experienced.
Case 1:
a.Original Primary Hierarchy:
Manager A reporting to Manager B
b.Update Primary Hierarchy via Admin Worker:
Manager A now reporting to Manager C

Issue 1: Manager A could no longer see their direct reports. When we act as proxy as Manager A, the plan is there but no employees
Resolution: For this, we just run refresh primary hierarchy for Manager A

Case 2:
a.Original Primary Hierarchy:
Manager H reporting to Manager J
b.Update Primary Hierarchy via Admin Worker:
Manager H now reporting to Manager K