Refactor trend-query handling, Streamer to listen to trends.