Vendor filter & search fix