Fixing the batch query.
Adding the address verification settings page.