Added check for addresses being addresses, and short-address-unlikely not