Add check for building name validity
Specify parcel_pfi where multiple exist

and trim trailing spaces