[BUG] CTOV fisherman house "moats" aren't fully enclosed

[kingstairs]

Describe the bug
Most fisherman house variants have a "moat" around them, but in many cases that water is not enclosed, sometimes to the side, sometimes underneath, sometimes both. This usually results in the water flowing everywhere and really annoying the rest of the villagers :-)
I've seen this with almost all village variants where a moat is used, especially where the terrain is not completely flat.

To Reproduce
This can be reproduced easily with a minimal setup - just look for a village with a fisherman.

Expected behaviour
The moat should be enclosed on all sides and underneath by appropriate blocks (dirt, cobblestone, stone bricks, etc.).
I'm guessing that the house structure itself should expand to explicitly include moat boundary blocks.

Screenshots
These show the problem. In this village all of the fisher houses showed the same issue.

Minecraft Version
1.21.1

CTOV Version
3.5.4

Add-ons used (Before 1.20)

Do you install Lithostitched?(1.20+)
Yes

Log

Additional context
Add any other context about the problem here.