search and manufacturer fixes