Remove address check and support addresses with '+'.