integrate new unit tags for citizens/cargo/beasts, add unit YieldDemands for citizens