Fixed mailing and geocoding issues for batch jobs