Mergin both extractors, needs testing.
Update of the sample config file.