- [query] few substance list fixes in the context of Issue #47.