diff --git a/src/query/SemiStructuredObjectInstanceQuery.php b/src/query/SemiStructuredObjectInstanceQuery.php
index ec43c7b..3e8f927 100644
--- a/src/query/SemiStructuredObjectInstanceQuery.php
+++ b/src/query/SemiStructuredObjectInstanceQuery.php
@@ -1,122 +1,132 @@
 <?php
 
 final class SemiStructuredObjectInstanceQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
   private $classPHIDs;
   private $statuses;
   private $canEdit;
 
+  private ?SemiStructuredObjectType $objectType = null;
+
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
+  public function withObjectType(SemiStructuredObjectType $object_type) {
+    $this->objectType = $object_type;
+    return $this->withClassPHIDs(array($object_type->getPHID()));
+  }
+
   public function withClassPHIDs(array $class_phids) {
     $this->classPHIDs = $class_phids;
     return $this;
   }
 
   public function withStatuses(array $statuses) {
     $this->statuses = $statuses;
     return $this;
   }
 
 
   public function withCanEdit($can_edit) {
     $this->canEdit = $can_edit;
     return $this;
   }
 
   public function newResultObject() {
-    // TODO maybe if I have classId, I can attach the class directly?
-    return new SemiStructuredObjectInstance();
+    $instance = new SemiStructuredObjectInstance();
+    if ($this->objectType) {
+      $instance->attachClass($this->objectType);
+    }
+    return $instance;
   }
 
   protected function didFilterPage(array $items) {
 
     $phids = mpull($items, 'getPHID');
 
     if ($this->canEdit) {
       $items = id(new PhabricatorPolicyFilter())
         ->setViewer($this->getViewer())
         ->requireCapabilities(array(
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
         ->apply($items);
     }
 
     return $items;
   }
 
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
     if ($this->ids !== null) {
       $where[] = qsprintf(
         $conn,
         'instances.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids !== null) {
       $where[] = qsprintf(
         $conn,
         'instances.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->classPHIDs !== null) {
       $where[] = qsprintf(
         $conn,
         'instances.classPHID IN (%Ls)',
         $this->classPHIDs);
     }
 
     if ($this->statuses !== null) {
       $where[] = qsprintf(
         $conn,
         'instances.status IN (%Ls)',
         $this->statuses);
     }
 
     return $where;
   }
 
   protected function willFilterPage(array $objects) {
     $classes = id(new SemiStructuredObjectTypeQuery())
       ->setViewer($this->getViewer())
       ->withPHIDs(mpull($objects, 'getClassPHID'))
       ->execute();
 
     $classes = mpull($classes, null, 'getPHID');
 
     foreach ($objects as $key => $object) {
       $class = idx($classes, $object->getClassPHID());
       if (!$class) {
         unset($objects[$key]);
         continue;
       }
       $object->attachClass($class);
     }
 
     return $objects;
   }
 
 
   public function getQueryApplicationClass() {
     return 'SemiStructuredDataApplication';
   }
 
   protected function getPrimaryTableAlias() {
     return 'instances';
   }
 
 }
diff --git a/src/query/SemiStructuredObjectInstanceSearchEngine.php b/src/query/SemiStructuredObjectInstanceSearchEngine.php
index af3f842..1d9dec0 100644
--- a/src/query/SemiStructuredObjectInstanceSearchEngine.php
+++ b/src/query/SemiStructuredObjectInstanceSearchEngine.php
@@ -1,166 +1,166 @@
 <?php
 
 final class SemiStructuredObjectInstanceSearchEngine
   extends PhabricatorApplicationSearchEngine {
 
   private $objectType;
 
   public function setObjectType(SemiStructuredObjectType $object_type) {
     $this->objectType = $object_type;
     return $this;
   }
 
   public function getObjectType() {
     return $this->objectType;
   }
 
   public function getResultTypeDescription() {
     return pht('Object Instances');
   }
 
   public function getApplicationClassName() {
     return 'SemiStructuredDataApplication';
   }
 
   public function newQuery() {
     $query = id(new SemiStructuredObjectInstanceQuery());
     if ($this->getObjectType()) {
-      $query->withClassPhids(array($this->getObjectType()->getPHID()));
+      $query->withObjectType($this->getObjectType());
     }
     return $query;
   }
 
   protected function buildCustomSearchFields() {
     return array(
 // TODO object class
 
       id(new SemiStructuredStaticSearchField())
         ->setKey('objecttype')
         ->setLabel(pht('Object Type'))
         ->setValue($this->getObjectType()->getName()),
 
 
 
     );
   }
 
   protected function getURI($path) {
     return "/semistruct/type/{$this->getObjectType()->getID()}/{$path}";
   }
 
   protected function getBuiltinQueryNames() {
     $names = array();
 
     $names['all'] = pht('All Instances');
 
     return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
     $viewer = $this->requireViewer();
 
     switch ($query_key) {
       case 'all':
         return $query;
       case 'open':
         return $query->setParameter(
           'statuses',
           array(
             SemiStructuredObjectType::STATUS_ACTIVE,
           ));
     }
 
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
 
   protected function buildQueryFromParameters(array $map) {
     $query = $this->newQuery();
 
     // TODO type id/phid
 
     // if ($map['statuses']) {
     //   $query->withStatuses($map['statuses']);
     // }
 
     // if ($map['editable'] !== null) {
     //   $query->withCanEdit($map['editable']);
     // }
 
     return $query;
   }
 
   protected function getRequiredHandlePHIDsForResultList(
     array $objects,
     PhabricatorSavedQuery $query) {
 
     return array();
   }
 
   public function renderResultsDirectly(array $items) {
     return $this->renderResultList(
       $items,
       new PhabricatorSavedQuery(),
       array());
   }
 
   protected function renderResultList(
     array $items,
     PhabricatorSavedQuery $query ,
     array $handles) {
 
     $viewer = $this->requireViewer();
 
     if ($items) {
       $edge_query = id(new PhabricatorEdgeQuery())
         ->withSourcePHIDs(mpull($items, 'getPHID'))
         ->withEdgeTypes(
           array(
             PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
           ));
 
       $edge_query->execute();
     }
 
     $list = id(new PHUIObjectItemListView())
       ->setViewer($viewer);
 
     foreach ($items as $instance) {
       $item = id(new PHUIObjectItemView())
         ->setViewer($viewer)
         ->setObjectName($instance->getName())
         ->setHeader($instance->getName())
         ->setHref($instance->getURI())
         ->setObject($instance);
 
       $icon = id(new PHUIIconView())
         ->setIcon($instance->getIcon());
       $item->setImageIcon($icon);
       $item->setEpoch($instance->getDateModified());
 
 
       $phid = $instance->getPHID();
       $project_phids = $edge_query->getDestinationPHIDs(array($phid));
       $project_handles = $viewer->loadHandles($project_phids);
 
       $item->addAttribute(
         id(new PHUIHandleTagListView())
           ->setLimit(4)
           ->setNoDataString(pht('No Tags'))
           ->setSlim(true)
           ->setHandles($project_handles));
 
       $list->addItem($item);
     }
 
     $result = new PhabricatorApplicationSearchResultView();
     $result->setObjectList($list);
     $result->setNoDataString(pht('No objects found.'));
 
     return $result;
   }
 
 
 }