Fixed issue with displaying and selecting alternate addresses