SERVER-12460 fix issues with whitespace