Fixed 5355, 5356, pending fix on the display of trait only if numeric

Signed-off-by: daniel@efficio.us.com <daniel@efficio.us.com>