Add fields checking
Merge branch 'work' of github.com:IntersectAustralia/asvo-tao into work