add query for channel and so on