Added logical or filter support