update to flag/field type handling - still to test
Merge branch 'master' of https://github.com/caregraf/FMQL