Remove 2 more instances of getFieldsDescribes and fixed issue with
compound address fields