[TASK] Migrate spatial search