1 verse has
whomever
in Edition Clear Qur'an by Talal Itani / Al-Anbiyaa (The Prophets)

21:9Then We fulfilled Our promise to them, and We saved them together with whomever We willed, and We destroyed the extravagant.