SWORD cleanup of filename handling #3385