Fix caller id issues also in archived case.