Fixed empty address and name insertions