Ensure space removal is after entity decoding