more support for '+' names