Pull changes from XmlLasdDatabase
Fix space preservation