diff --git a/packages/viewer-sandbox/src/Sandbox.ts b/packages/viewer-sandbox/src/Sandbox.ts
index 05272d2f1..05d5b7905 100644
--- a/packages/viewer-sandbox/src/Sandbox.ts
+++ b/packages/viewer-sandbox/src/Sandbox.ts
@@ -61,6 +61,11 @@ export default class Sandbox {
       this.addStreamControls(url)
       this.addViewControls()
       this.properties = this.viewer.getObjectProperties()
+      // const dataTree = this.viewer.getDataTree()
+      // const objects = dataTree.findAll((guid, obj) => {
+      //   return obj.speckle_type === 'Objects.Geometry.Mesh'
+      // })
+      // console.log(objects)
     })
     viewer.on(ViewerEvent.UnloadComplete, (url: string) => {
       this.removeViewControls()
diff --git a/packages/viewer/src/IViewer.ts b/packages/viewer/src/IViewer.ts
index 09c0cd17a..841dd92d6 100644
--- a/packages/viewer/src/IViewer.ts
+++ b/packages/viewer/src/IViewer.ts
@@ -5,8 +5,6 @@ import { PropertyInfo } from './modules/filtering/PropertyManager'
 import { DataTree } from './modules/tree/DataTree'
 
 export interface ViewerParams {
-  postprocessing: boolean
-  reflections: boolean
   showStats: boolean
   environmentSrc: Asset | string
 }
@@ -33,8 +31,6 @@ export interface Asset {
  * a .png will work just fine.
  */
 export const DefaultViewerParams: ViewerParams = {
-  postprocessing: false,
-  reflections: true,
   showStats: false,
   environmentSrc: {
     src: sampleHdri,
@@ -176,10 +172,10 @@ export interface IViewer {
     includeDescendants?
   ): Promise<FilteringState>
 
-  selectObjects(objectIds: string[]): Promise<void>
-  resetSelection(): Promise<void>
-  highlightObjects(objectIds: string[]): Promise<void>
-  resetHighlight(): Promise<void>
+  selectObjects(objectIds: string[]): Promise<FilteringState>
+  resetSelection(): Promise<FilteringState>
+  highlightObjects(objectIds: string[]): Promise<FilteringState>
+  resetHighlight(): Promise<FilteringState>
 
   setColorFilter(prop: PropertyInfo): Promise<FilteringState>
   removeColorFilter(): Promise<FilteringState>
diff --git a/packages/viewer/src/modules/Viewer.ts b/packages/viewer/src/modules/Viewer.ts
index 0820143d9..01981602f 100644
--- a/packages/viewer/src/modules/Viewer.ts
+++ b/packages/viewer/src/modules/Viewer.ts
@@ -180,17 +180,15 @@ export class Viewer extends EventEmitter implements IViewer {
     return PropertyManager.getProperties(resourceURL)
   }
 
-  public selectObjects(objectIds: string[]): Promise<void> {
-    return new Promise<void>((resolve) => {
-      this.filteringManager.selectObjects(objectIds)
-      resolve()
+  public selectObjects(objectIds: string[]): Promise<FilteringState> {
+    return new Promise<FilteringState>((resolve) => {
+      resolve(this.filteringManager.selectObjects(objectIds))
     })
   }
 
-  public resetSelection(): Promise<void> {
-    return new Promise<void>((resolve) => {
-      this.filteringManager.resetSelection()
-      resolve()
+  public resetSelection(): Promise<FilteringState> {
+    return new Promise<FilteringState>((resolve) => {
+      resolve(this.filteringManager.resetSelection())
     })
   }
 
@@ -242,17 +240,15 @@ export class Viewer extends EventEmitter implements IViewer {
     })
   }
 
-  public highlightObjects(objectIds: string[]): Promise<void> {
-    return new Promise<void>((resolve) => {
-      this.filteringManager.highlightObjects(objectIds)
-      resolve()
+  public highlightObjects(objectIds: string[]): Promise<FilteringState> {
+    return new Promise<FilteringState>((resolve) => {
+      resolve(this.filteringManager.highlightObjects(objectIds))
     })
   }
 
-  public resetHighlight(): Promise<void> {
-    return new Promise<void>((resolve) => {
-      this.filteringManager.resetHighlight()
-      resolve()
+  public resetHighlight(): Promise<FilteringState> {
+    return new Promise<FilteringState>((resolve) => {
+      resolve(this.filteringManager.resetHighlight())
     })
   }
 
diff --git a/packages/viewer/src/modules/tree/DataTree.ts b/packages/viewer/src/modules/tree/DataTree.ts
index db5b49b0f..7b53ad098 100644
--- a/packages/viewer/src/modules/tree/DataTree.ts
+++ b/packages/viewer/src/modules/tree/DataTree.ts
@@ -16,7 +16,7 @@ class DataTreeInternal implements DataTree {
 
   public constructor() {
     this.tree = new TreeModel()
-    this.root = this.tree.parse({ id: 'MOTHERSHIP' })
+    this.root = this.tree.parse({ guid: 'MOTHERSHIP' })
   }
   public findAll(predicate: ObjectPredicate): SpeckleObject[] {
     return this.root
@@ -53,7 +53,7 @@ export class DataTreeBuilder {
       }
 
       parent = dataTree.root.first((localNode) => {
-        return localNode.model.id === node.parent.model.id
+        return localNode.model.guid === node.parent.model.id
       })
 
       const _node: TreeNode = WorldTree.getInstance().parse({