fix for missing base query classes
Merge pull request #538 from gharlan/missing-base-query-classes

Missing parent Query class