Fixes #18: When parameter is a clientID should be rendered as {CLIENT_ID} ({CLIENT_NAME})