added cli param to enable char entity expansion + docu