Fixed issue where spaces before ampersands and question marks were being trimmed in page output