Improved wikipedia enrichment on import