Stop using Products collection

Stop using Products collection - options search is not working with it currently.