Villagers disappeared in new snapshot

In the new snapshot 20w07a a group of villagers that I had been trading with and developing in my base disappeared. Some of the villagers were pre villager overhaul legacy, but most were those who I bred and traded up for my desired trades post villager update. The only villager around my base that is left is a zombie villager that I cured back in 1.14. I have saved and backed up my world for both 20w06a and the latest official release edition, but I was wondering if there was anything I could do other than wait.