Phone Number/Fax pulling over when Hospice/Hospital are entered

When on the Vitals page, it would be helpful if the Hospice/Hospital phone and fax would pull over without having to select a dr first. Sometimes the FH won't know who the dr is until after the attestation is signed.