updated filtering rules