added subscription fields, fixed encoding