by_first_letter fixes