Quote, fix place name subclasses, more logging