EXPORT: actually use results from search argument
EXPORT: fix regressions