HCSVLAB-838 Extend annotations query functionality
Merge branch 'master' of github.com:IntersectAustralia/hcsvlab