Fix problem with escaping of ',' in target URI; turn of some debug output of annotation graph