added country presence check to address