Fix space and ellipsis handling