Enhance dropdown extractor regex