Hawtio weirdly divides address name and queue name containing minus and/or comma

Hawtio issues with special names:
comma in address/name (addr_,_name) -> weird hawtio structure is generated. See attached artemis_hawtio_comma.png for details.

minus in address/name (addr_-_name) -> results in incorrect hawtio (internal) name having comma instead of 'minus' character:

address_,_name, queue_,_name

See attached artemis_hawtio_minus.png

Note: I was able to receive message from queue_-_name, so it seems it's just some internal representation, that hawtio can't display.