[Tunji] #51 merged filter by programme and by ip into a single watch