Company serach issue fix