wiki redirects and disambiguation handled; freebase more robust