PERF: improve perf on consistency query in importers