Redefined current phone and address to just be those with current set to Yes.