diff --git a/module/cerner-medico/medication.xml b/module/cerner-medico/medication.xml
index c38f39f..97d9a6a 100644
--- a/module/cerner-medico/medication.xml
+++ b/module/cerner-medico/medication.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <notfalldatenmodul>
 	<name>Medikation</name>
-	<version>1.0</version>
-	<maintainer>FEK, Serpen</maintainer>
+	<version>1.1</version>
+	<maintainer>FEK, Katlun</maintainer>
 	<history />
 	<parameter>
 		<param>pat</param>
@@ -31,7 +31,7 @@ SELECT
 	m2530mdc.des,
 	regexp_substr((SELECT LISTAGG(attval,'') WITHIN GROUP (ORDER BY attcol,attrow) wirkstoff FROM m2501mda WHERE m2501mda.att='MED_DESXL' AND m2501mda.mdc=m2530mdc.mdc AND attcol=0), '\[(.*)\]', 1, 1, 'i',1) AS wirkstoff,
 	add_info_table.attval AS ADM_INFO,
-	add_ondemand_table.attval AS ADD_ONDEMAND,
+	m2531dos.ondemand AS ADD_ONDEMAND,
 	(SELECT LISTAGG(attval,'') WITHIN GROUP (ORDER BY attcol,attrow) DOS_COMMENT FROM m2504doa WHERE m2504doa.att='DOS_COMMENT' AND m2504doa.dos=m2531dos.dos) AS DOS_COMMENT,
 	CASE adm_roa_table.attval
 		WHEN 'T0029A4%OR' THEN 'oral'
@@ -39,7 +39,7 @@ SELECT
 		WHEN 'T0023CA%IVN' THEN 'i.v.'
 		WHEN 'T00232E%BP' THEN 'pulmonal'
 		WHEN 'T002AF0%RE' THEN 'rektal'
-		WHEN 'T002AEC%MH' THEN 'Mundhöhle'
+		WHEN 'T002AEC%MH' THEN 'Mundhoehle'
 		WHEN 'T002AC3%TD' THEN 'transdermal'
 		WHEN 'T000018%IK' THEN 'intrakorporal'
 		WHEN 'GA00B71%EX' THEN 'topisch/extern'
@@ -69,7 +69,7 @@ SELECT
 FROM m2530mdc
 	JOIN m2531dos ON m2530mdc.mdc = m2531dos.mdc
 	LEFT JOIN m2504doa adm_roa_table ON adm_roa_table.dos=m2531dos.dos AND adm_roa_table.att='ADM_ROA' AND adm_roa_table.attcol=0 AND adm_roa_table.attrow=0
-	LEFT JOIN m2504doa add_ondemand_table ON add_ondemand_table.dos=m2531dos.dos AND add_ondemand_table.att='ADD_ONDEMAND' AND add_ondemand_table.attcol=0 AND add_ondemand_table.attrow=0
+	--LEFT JOIN m2504doa add_ondemand_table ON add_ondemand_table.dos=m2531dos.dos AND add_ondemand_table.att='ADD_ONDEMAND' AND add_ondemand_table.attcol=0 AND add_ondemand_table.attrow=0
 	LEFT JOIN m2504doa add_info_table ON add_info_table.dos=m2531dos.dos AND add_info_table.att='ADM_INFO' AND add_info_table.attcol=0 AND add_info_table.attrow=0
 	JOIN x8201psr ON x8201psr.psr = m2531dos.orderer
 WHERE