CM single > company location edit - <select> is empty

app/Models/CompanyLocation.php

@@ -10,7 +10,9 @@ class CompanyLocation extends Model
     protected $table = 'company_location';
 
     public function displayName(){
-        return implode(" ", [$this->line1, $this->city, $this->state]);
+        $parts = [$this->internal_name, $this->line1, $this->city, $this->state];
+        if(trim(implode('', $parts)) == '') return '';
+        return implode(", ", $parts);
     }
 
     public function format(){

resources/views/app/patient/care-month/forms/put-company-location.blade.php

@@ -5,9 +5,11 @@
         <div class="mb-2">
             <select name="companyLocationUid" class="form-control form-control-sm">
                 <option value="">-- select --</option>
-                @if ($careMonth->company && $careMonth->company->locations)
-                    @foreach ($careMonth->company->locations as $location)
-                        <option value="{{ $location->uid }}">{{ $location->line1 . ', ' . $location->city }}</option>
+                @if ($careMonth->companyPro && $careMonth->companyPro->company && $careMonth->companyPro->company->locations)
+                    @foreach ($careMonth->companyPro->company->locations as $location)
+                        @if($location->displayName())
+                            <option value="{{ $location->uid }}">{{ $location->displayName() }}</option>
+                        @endif
                     @endforeach
                 @endif
             </select>