bug926021 - Fix HTML entities for space