diff --git a/R/app_version.R b/R/app_version.R
index 79df9cf..ff73a30 100644
--- a/R/app_version.R
+++ b/R/app_version.R
@@ -1 +1 @@
-app_version <- function()'250320_1144'
+app_version <- function()'250320_1310'
diff --git a/R/custom_SelectInput.R b/R/custom_SelectInput.R
index d9da27b..3704c98 100644
--- a/R/custom_SelectInput.R
+++ b/R/custom_SelectInput.R
@@ -64,13 +64,16 @@ columnSelectInput <- function(inputId, label, data, selected = "", ...,
           return '<div style=\"padding: 3px 12px\">' +
                    '<div><strong>' +
                       escape(item.data.name) + ' ' +
+                      '</strong>' +
+                      (item.data.dataclass != '' ?
                       '<span style=\"opacity: 0.9;\"><code style=\"color: black;\"> ' +
                         item.data.dataclass +
-                      '</code></span>' + ' ' +
+                      '</code></span>' : '' ) + ' ' +
+                      (item.data.datatype != '' ?
                       '<span style=\"opacity: 0.9;\"><code style=\"color: black;\"> ' +
                         item.data.datatype +
-                      '</code></span>' +
-                   '</strong></div>' +
+                      '</code></span>' : '' ) +
+                   '</div>' +
                    (item.data.label != '' ? '<div style=\"line-height: 1em;\"><small>' + escape(item.data.label) + '</small></div>' : '') +
                  '</div>';
         },
@@ -89,7 +92,6 @@ columnSelectInput <- function(inputId, label, data, selected = "", ...,
 }
 
 
-
 #' A selectizeInput customized for named vectors
 #'
 #' @param inputId passed to \code{\link[shiny]{selectizeInput}}