Fix queries returning just the object id

which meant that subtype queries were being instantiated
as the parent class.
Make sure _types is included when querying subtypes

so that we can instantiate the correct subclass.
Bump version