All availabe FI/PI are now handled correctly when import by company
Fixed wrong handling of xpath in last commit. Cleaner log messages