Currently hard-coded a removal of "+" which is not ideal.
Currently hard-coded a removal of "+" which is not ideal.