Add grabber rules and improve filtering