Fix correctness and threading issue in new Manufacturer lookup mechanism. It was...