CON-2230 Adding spaces around operands