Stream search improvement + bug fix (category selection).