Add content grabber rules and improve filtering