fix subscription retrieve query and cancel api