Fix subtypes not working when using order_by

& refactor how we create new queries to prevent
this from happening again.
Bump version
Merge pull request #30 from johnnyg/fix-subtypes

Fix subtypes