diff --git a/current/[FNDD_GET_WINDREAM_CHOICELIST_ITEMS]/[FNDD_GET_WINDREAM_CHOICELIST_ITEMS].sql b/current/[FNDD_GET_WINDREAM_CHOICELIST_ITEMS]/[FNDD_GET_WINDREAM_CHOICELIST_ITEMS].sql
index b1d8f67..8a735ad 100644
--- a/current/[FNDD_GET_WINDREAM_CHOICELIST_ITEMS]/[FNDD_GET_WINDREAM_CHOICELIST_ITEMS].sql
+++ b/current/[FNDD_GET_WINDREAM_CHOICELIST_ITEMS]/[FNDD_GET_WINDREAM_CHOICELIST_ITEMS].sql
@@ -16,11 +16,12 @@ GO
 -- Tel.: 0641/202360 • E-Mail: info-flow@digitaldata.works
 -- =================================================================
 -- Creation Date / Author:    13.12.2024 / MK
--- Version Date / Editor:     13.12.2024 / MK
--- Version Number:            1.0.0.0
+-- Version Date / Editor:     23.04.2025 / HE, MK
+-- Version Number:            1.1.0.0
 -- =================================================================
 -- History:
 -- 13.12.2024 / MK - First Version
+-- 23.04.2025 / HE, MK - Adding Support for other data types
 
 CREATE OR ALTER FUNCTION [dbo].[FNDD_GET_WINDREAM_CHOICELIST_ITEMS] (	
 		@szListName		NVARCHAR(255)
@@ -29,8 +30,7 @@ RETURNS TABLE
 AS  
 RETURN
 
-	SELECT TOP (100) PERCENT [szValue] as 'Auswahlliste'
+	SELECT TOP (100) PERCENT COALESCE([szValue],CONVERT(NVARCHAR,[dwValue]),CONVERT(NVARCHAR,[decValue]),CONVERT(NVARCHAR,[blValue]),CONVERT(NVARCHAR,[lfValue])) as 'Auswahlliste'
 	  FROM [windreamDB].[dbo].[ChoiceListItem]
 	  WHERE [dwChoiceListID] = (SELECT [dwChoiceListID] FROM [windreamDB].[dbo].[ChoiceList] WHERE [szListName] = @szListName)
-	    AND LEN([szValue]) > 0
-	ORDER BY [Auswahlliste] ASC
\ No newline at end of file
+	ORDER BY [dwValueOrdNr] ASC
\ No newline at end of file