Fix by_name to include text normalisation.