Fix bugs with intrusive clients when there is no tags selected