Fixing up calls to select_best_available_language (flipped parameter order) for #1601