better regexp in extractor