Hi Ashley
In regard to your questions please see my responses below.
Q1: You don’t need to worry about charity status with the ESF, if the land meets the criteria as public benefit (appendix D) then it should be classified as PUBLIC. You are 100% correct Offices should be COMNV and the warehouses should be classified industrial or INDNV.
Q2: If the property is owned by a government organisation, they would GOVT. If not government owned, then these properties would be RESNV even if owned by a charity or PBI.
Hope this is helpful.
Regards,
Andrew