Crawler refactoring
ECO mapper more robust

Huge fix.