@@ -314,6 +314,7 @@ setMethod(f = "draw",

 		test2 = TRUE

 	} else {

 		test2 = test

+		test = ""

 	}

 	if(test2) {

         grid.newpage()

@@ -304,7 +304,7 @@ Heatmap = function(matrix, col, name,

     show_heatmap_legend = TRUE,

     heatmap_legend_param = list(title = name),

-    use_raster = nrow(matrix) > 5000, 

+    use_raster = nrow(matrix) > 2000 || ncol(matrix) > 2000, 

     raster_device = c("png", "jpeg", "tiff", "CairoPNG", "CairoJPEG", "CairoTIFF"),

     raster_quality = 2,

     raster_device_param = list(),

@@ -1015,6 +1015,19 @@ make_cluster = function(object, which = c("row", "column")) {

                                 lt$fmt = title

                                 do.call(sprintf, lt)

                             })

+                        } else if(grepl("@\\{.+\\}", title)) {

+                            title = apply(unique(split), 1, function(x) {

+                                x = x

+                                GetoptLong::qq(title)

+                            })

+                        } else if(grepl("\\{.+\\}", title)) {

+                            if(!requireNamespace("glue")) {

+                                stop("You need to install glue package.")

+                            }

+                            title = apply(unique(split), 1, function(x) {

+                                x = x

+                                glue::glue(title)

+                            })

                         }

                     }

                 }

@@ -140,7 +140,10 @@ HeatmapAnnotation = function(...,

     		warning("`df` should be a data frame while not a matrix. Convert it to data frame.")

     		df = as.data.frame(df)

     	} else if(!is.data.frame(df)) {

-    		stop("`df` should be a data frame.")

+    		oe = try(df <- as.data.frame(df), silent = TRUE)

+    		if(inherits(oe, "try-errir")) {

+    			stop("`df` should be a data frame.")

+    		}

     	}

     }

@@ -555,6 +558,7 @@ setMethod(f = "draw",

         test2 = TRUE

     } else {

         test2 = test

+        test = ""

     }

     if(test2) {

@@ -130,6 +130,7 @@ setMethod(f = "column_order",

 	        lt_rd = c(lt_rd, list(lt))

 	    }

 	    names(lt_rd) = names(object@ht_list)[ht_index]

+	    if(length(lt_rd) == 1) lt_rd = lt_rd[[1]]

 	    return(lt_rd)

 	}

 })

@@ -528,6 +528,7 @@ setMethod(f = "draw",

         test2 = TRUE

     } else {

         test2 = test

+        test = ""

     }

     verbose = ht_opt$verbose

@@ -109,7 +109,7 @@ ht_opt = setGlobalOptions(

 			}

 		},

 		.length = 1),

-	show_vp_border = TRUE,

+	show_vp_border = FALSE,

 	anno_simple_row_size = unit(5, "mm")

 )

@@ -1011,6 +1011,7 @@ setMethod(f = "draw",

 		test2 = TRUE

 	} else {

 		test2 = test

+		test = ""

 	}

 	if(test2) {

         grid.newpage()