Update http_extractor to more closely resemble previous functionality