Search: Various tweaks to backend importer
Search: more unit tests