more fixes, tests, glyph/glyphsepc correspondance
Merge pull request #1200 from ContinuumIO/bugfix/query_conjuctions

fix query for conjuctions