Added querying for a shape from classifier dataset