Added CIDR and regexp filter