diff --git a/DESCRIPTION b/DESCRIPTION
index 981cb17..dacc8e0 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -26,4 +26,3 @@ Suggests:
     covr,
     testthat,
     vdiffr
-RoxygenNote: 7.1.2
diff --git a/R/forest_model.R b/R/forest_model.R
index 9ccc6fb..a171eaa 100644
--- a/R/forest_model.R
+++ b/R/forest_model.R
@@ -241,7 +241,7 @@ forest_model <- function(model,
             )
             if (inherits(model, "coxph")) {
               event_detail_tab <- lapply(
-                setNames(seq_len(ncol(model$y)), colnames(model$y)),
+                stats::setNames(seq_len(ncol(model$y)), colnames(model$y)),
                 function(y_col) {
                   apply(
                     cols,
@@ -277,10 +277,17 @@ forest_model <- function(model,
                 seq_along(interaction_terms),
                 function(i) {
                   if (term_row$interaction_terms_are_factors[[1]][i]) {
-                    ilv <- tibble::tibble(
-                      level = model$xlevels[[remove_backticks(interaction_terms[i])]],
-                      label = paste0(interaction_terms[i], level)
-                    )
+                    if (term_row$interaction_terms_are_logical[[1]][i]) {
+                      ilv <- tibble::tibble(
+                        level = c("FALSE", "TRUE"),
+                        label = paste0(interaction_terms[i], level)
+                      )
+                    } else {
+                      ilv <- tibble::tibble(
+                        level = model$xlevels[[remove_backticks(interaction_terms[i])]],
+                        label = paste0(interaction_terms[i], level)
+                      )
+                    }
                   } else {
                     ilv <- tibble::tibble(level = NA, label = interaction_terms[i])
                   }
@@ -459,6 +466,7 @@ make_forest_terms_basic <- function(model) {
     is_interaction = colSums(mdl_factors) > 1,
     interaction_terms = lapply(term_label, function(tl) names(which(attr(mdl_terms, "factors")[, tl] == 1))),
     interaction_vars = lapply(interaction_terms, remove_backticks),
-    interaction_terms_are_factors = lapply(interaction_vars, function(iv) mdl_data_classes_factors[iv])
+    interaction_terms_are_factors = lapply(interaction_vars, function(iv) mdl_data_classes_factors[iv]),
+    interaction_terms_are_logical = lapply(interaction_vars, function(iv) mdl_terms_are_logical[iv])
   )
 }
diff --git a/R/model_frame_coxph_simple.R b/R/model_frame_coxph_simple.R
index 566cc0d..edd5cbf 100644
--- a/R/model_frame_coxph_simple.R
+++ b/R/model_frame_coxph_simple.R
@@ -1,5 +1,5 @@
 model_frame_coxph_simple <- function(model) {
-  cph_terms <- terms(model)
+  cph_terms <- stats::terms(model)
   fcall <- model$call
   indx <- match(c("formula", "data", "weights", "subset",
                   "na.action", "cluster", "id", "istate"), names(fcall),
diff --git a/tests/testthat/_snaps/forest_model/sample-forest-model-plot-for-lung.svg b/tests/testthat/_snaps/forest_model/sample-forest-model-plot-for-lung.svg
index 118c812..8491eb8 100644
--- a/tests/testthat/_snaps/forest_model/sample-forest-model-plot-for-lung.svg
+++ b/tests/testthat/_snaps/forest_model/sample-forest-model-plot-for-lung.svg
@@ -27,10 +27,10 @@
 </defs>
 <g clip-path='url(#cpOC4yMnw3MTQuNTJ8MjIuNzh8NTU3Ljcx)'>
 <rect x='8.22' y='22.78' width='706.30' height='534.92' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
-<rect x='8.22' y='82.22' width='706.30' height='59.44' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
-<rect x='8.22' y='201.09' width='706.30' height='59.44' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
-<rect x='8.22' y='319.96' width='706.30' height='59.44' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
-<rect x='8.22' y='438.83' width='706.30' height='59.44' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
+<rect x='8.22' y='82.22' width='706.30' height='59.44' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
+<rect x='8.22' y='201.09' width='706.30' height='59.44' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
+<rect x='8.22' y='319.96' width='706.30' height='59.44' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
+<rect x='8.22' y='438.83' width='706.30' height='59.44' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
 <polygon points='254.06,117.63 265.44,117.63 265.44,106.25 254.06,106.25 ' style='stroke-width: 0.71; stroke: none; fill: #000000;' />
 <polygon points='253.58,177.06 264.96,177.06 264.96,165.68 253.58,165.68 ' style='stroke-width: 0.71; stroke: none; fill: #000000;' />
 <polygon points='222.41,236.50 233.79,236.50 233.79,225.12 222.41,225.12 ' style='stroke-width: 0.71; stroke: none; fill: #000000;' />
diff --git a/tests/testthat/_snaps/forest_rma/sample-forest-rma-plot-for-dat-bcg.svg b/tests/testthat/_snaps/forest_rma/sample-forest-rma-plot-for-dat-bcg.svg
index 763f899..88b497b 100644
--- a/tests/testthat/_snaps/forest_rma/sample-forest-rma-plot-for-dat-bcg.svg
+++ b/tests/testthat/_snaps/forest_rma/sample-forest-rma-plot-for-dat-bcg.svg
@@ -27,14 +27,14 @@
 </defs>
 <g clip-path='url(#cpOC4yMnw3MTQuNTJ8MjIuNzh8NTU3Ljcx)'>
 <rect x='8.22' y='22.78' width='706.30' height='534.92' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
-<rect x='8.22' y='56.22' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
-<rect x='8.22' y='123.08' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
-<rect x='8.22' y='189.95' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
-<rect x='8.22' y='256.81' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
-<rect x='8.22' y='323.68' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
-<rect x='8.22' y='390.54' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
-<rect x='8.22' y='457.41' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #EFEFEF;' />
-<polygon points='361.83,507.56 373.43,502.54 385.03,507.56 373.43,512.57 361.83,507.56 ' style='stroke-width: 1.07; stroke: none; fill: #000000;' />
+<rect x='8.22' y='56.22' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
+<rect x='8.22' y='123.08' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
+<rect x='8.22' y='189.95' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
+<rect x='8.22' y='256.81' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
+<rect x='8.22' y='323.68' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
+<rect x='8.22' y='390.54' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
+<rect x='8.22' y='457.41' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #EFEFEF;' />
+<polygon points='361.83,507.56 373.43,502.54 385.03,507.56 373.43,512.57 361.83,507.56 ' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; fill: #000000;' />
 <polygon points='361.99,78.62 373.37,78.62 373.37,67.24 361.99,67.24 ' style='stroke-width: 0.71; stroke: none; fill: #000000;' />
 <polygon points='339.08,112.05 350.46,112.05 350.46,100.68 339.08,100.68 ' style='stroke-width: 0.71; stroke: none; fill: #000000;' />
 <polygon points='346.89,145.49 358.27,145.49 358.27,134.11 346.89,134.11 ' style='stroke-width: 0.71; stroke: none; fill: #000000;' />
@@ -89,7 +89,7 @@
 <polyline points='379.14,476.63 379.14,471.62 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
 <line x1='301.74' y1='557.71' x2='301.74' y2='22.78' style='stroke-width: 1.07; stroke-linecap: butt;' />
 <line x1='396.95' y1='557.71' x2='396.95' y2='56.22' style='stroke-width: 1.07; stroke-dasharray: 5.69,5.69; stroke-linecap: butt;' />
-<rect x='8.22' y='524.27' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: square; stroke-linejoin: miter; fill: #FFFFFF;' />
+<rect x='8.22' y='524.27' width='706.30' height='33.43' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #FFFFFF;' />
 <text x='26.76' y='77.83' style='font-size: 14.23px; font-family: sans;' textLength='88.60px' lengthAdjust='spacingAndGlyphs'>Aronson 1948</text>
 <text x='26.76' y='111.26' style='font-size: 14.23px; font-family: sans;' textLength='152.65px' lengthAdjust='spacingAndGlyphs'>Ferguson &amp; Simes 1949</text>
 <text x='26.76' y='144.69' style='font-size: 14.23px; font-family: sans;' textLength='130.51px' lengthAdjust='spacingAndGlyphs'>Rosenthal et al 1960</text>