Added support for more filter conditions.