Added use of the addressfield to replace the location field group.