add tag  assert for metadata listener, CS fixes