Also change functionality so the "Please Choose" entry is only added
where it is actually needed, so that the number of available domains
actually matches the length of the returned list