Fix the way villagers claim their point of interest

I started making a villager trading hall on a realm and the villagers were claiming the lecture that another villager had claimed. I killed the new villagers so the old one can claim his lecture but he never did. Also I would like Villagers to claim the nearest point of interest so it is easier to make them connect with what we want them to.