CLOUD-129 separated tags