fixed help message for person/role name
removed unused code
fixed query not setting origin on parse()