Mob Motion Tag fails to update

I have created a witch farm (at a witch hut) that relies upon the Zombified Hoglin (Zoglin) knocking witches into a killing chamber. (This is on a multiplayer server.) Pre-1.16.2 it worked fine. Once updating, the Zoglin hits the witch, then continues trying to track it post death and its motion tag gets stuck at 0, some small negative number, 0. Therefore, the Zoglin stops moving and will not attack other spawned witches even after the initial target is dead. The Motion Tag seems to reset upon re-logging to the server, but then is stuck again after one witch is attacked.