More minor fixes to SPATIAL_ENTITY section