These other fixes for validation in not setting values for obs or dates in encounters I have also fixed in a recent commit, so can be reverted from here.