Fixed searching issue with bulk loading