WSJ extractor fix
WSJ extractor fix 2
WSJ extractor fix 3
WSJ extractor fix 4
Merge remote-tracking branch 'origin/feature/WSJ'