improve common extraction rules