Improve search bot, adds streaming