Unbalanced villager mechanics revamp

Villagers can be easily infected and cured to get massive discounts on items. It goes to the point when you can buy bookshelf for 1 emerald, destroy it and sell 3 books for 1 emerald each to the same villager. It is extremely easy to do and feels like an infinite money exploit. I don't know how that can be in the game. You can also get diamond items for 1 emerald after curing villager a few times. I know this is being addressed with experimental villager changes but I feel like on top of that there should be a limit of discount because it is simply dumb to be able to buy everything for 1 emerald.