Fix client parse errors with '=' in remark strings (#632)

Fix client parse errors with '=' in remark strings (#632) #400