Fix search
Revert to OLO seriate (PCA) didn't work

- Refactor to newer strict io api