Complete all village related queries and thus all queries

Next step is to add more parameters