wip on spatial search fixes