diff --git a/questtypes/choiceinput/html/quest.tpl b/questtypes/choiceinput/html/quest.tpl
index 88074135..1f9979ec 100644
--- a/questtypes/choiceinput/html/quest.tpl
+++ b/questtypes/choiceinput/html/quest.tpl
@@ -1,32 +1,17 @@
 <form method="post">
 	<p>
-		<?php
-			$text = $t->t($task['text']);
-			
-			// Insert comboboxes
-			foreach(array_reverse($choiceLists) as &$list)
-			{
-				// Get positions
-				$posStart = mb_strrpos($text, '[choiceinput]', 0, 'UTF-8');
-				$posEnd = $posStart + mb_strlen('[choiceinput]', 'UTF-8');
-				
-				// Create combobox
-				$combobox = '<select name="answers[]">';
-				foreach($list['values'] as &$choice) {
-					$combobox .= sprintf(
-						'<option value="%s" %s>%s</option>',
-						$choice['id'],
-						(array_key_exists('answer', $list) && $list['answer'] == $choice['id']) ? 'selected="selected"' : null,
-						$choice['text']
-					);
-				}
-				$combobox .= '</select>';
-				
-				// Insert input field
-				$text = mb_substr($text, 0, $posStart, 'UTF-8') . $combobox . mb_substr($text, $posEnd, mb_strlen($text)-$posEnd, 'UTF-8');
-			}
-		?>
-		<?=$text?>
+		<?php $posStart = 0; ?>
+		<?php foreach($choiceLists as &$list) : ?>
+		<?php $posEnd = mb_strpos($task['text'], '[choiceinput]', $posStart, 'UTF-8'); ?>
+		<?=$t->t(mb_substr($task['text'], $posStart, $posEnd-$posStart, 'UTF-8'))?>
+		<select name="answers[]">
+			<?php foreach($list['values'] as &$choice) : ?>
+			<option value="<?=$choice['id']?>" <?php if(array_key_exists('answer', $list) && $list['answer'] == $choice['id']) : ?>selected="selected"<?php endif ?>><?=$choice['text']?></option>
+			<?php endforeach ?>
+		</select>
+		<?php $posStart = $posEnd + mb_strlen('[choiceinput]', 'UTF-8'); ?>
+		<?php endforeach ?>
+		<?=$t->t(mb_substr($task['text'], $posStart, mb_strlen($task['text'], 'UTF-8')-$posStart, 'UTF-8'))?>
 	</p>
 	<input type="submit" name="submit" value="<?=_('solve')?>" />
 </form>
diff --git a/questtypes/choiceinput/html/submission.tpl b/questtypes/choiceinput/html/submission.tpl
index c9c2ef41..3f51f9a8 100644
--- a/questtypes/choiceinput/html/submission.tpl
+++ b/questtypes/choiceinput/html/submission.tpl
@@ -1,29 +1,14 @@
 <p>
-	<?php
-		$text = $t->t($task['text']);
-		
-		// Insert comboboxes
-		foreach(array_reverse($choiceLists) as &$list)
-		{
-			// Get positions
-			$posStart = mb_strrpos($text, '[choiceinput]', 0, 'UTF-8');
-			$posEnd = $posStart + mb_strlen('[choiceinput]', 'UTF-8');
-			
-			// Create combobox
-			$combobox = '<select name="answers[]" disabled="disabled">';
-			foreach($list['values'] as &$choice) {
-				$combobox .= sprintf(
-					'<option value="%s" %s>%s</option>',
-					$choice['id'],
-					(array_key_exists('answer', $list) && $list['answer'] == $choice['id']) ? 'selected="selected"' : null,
-					$choice['text']
-				);
-			}
-			$combobox .= '</select>';
-			
-			// Insert input field
-			$text = mb_substr($text, 0, $posStart, 'UTF-8') . $combobox . mb_substr($text, $posEnd, mb_strlen($text)-$posEnd, 'UTF-8');
-		}
-	?>
-	<?=$text?>
+	<?php $posStart = 0; ?>
+	<?php foreach($choiceLists as &$list) : ?>
+	<?php $posEnd = mb_strpos($task['text'], '[choiceinput]', $posStart, 'UTF-8'); ?>
+	<?=$t->t(mb_substr($task['text'], $posStart, $posEnd-$posStart, 'UTF-8'))?>
+	<select name="answers[]" disabled="disabled">
+		<?php foreach($list['values'] as &$choice) : ?>
+		<option value="<?=$choice['id']?>" <?php if(array_key_exists('answer', $list) && $list['answer'] == $choice['id']) : ?>selected="selected"<?php endif ?>><?=$choice['text']?></option>
+		<?php endforeach ?>
+	</select>
+	<?php $posStart = $posEnd + mb_strlen('[choiceinput]', 'UTF-8'); ?>
+	<?php endforeach ?>
+	<?=$t->t(mb_substr($task['text'], $posStart, mb_strlen($task['text'], 'UTF-8')-$posStart, 'UTF-8'))?>
 </p>
diff --git a/questtypes/textinput/html/quest.tpl b/questtypes/textinput/html/quest.tpl
index 6dc79b37..9aaf010b 100644
--- a/questtypes/textinput/html/quest.tpl
+++ b/questtypes/textinput/html/quest.tpl
@@ -1,29 +1,13 @@
 <form method="post" class="textinput">
 	<p>
-		<?php
-			$text = $t->t($task['text']);
-			
-			// Insert input fields
-			foreach(array_reverse($fields) as &$field)
-			{
-				// Get positions
-				$posStart = mb_strrpos($text, '[textinput]', 0, 'UTF-8');
-				$posEnd = $posStart + mb_strlen('[textinput]', 'UTF-8');
-				
-				// Create input field
-				$class = ($field['size'] != 'default') ? $field['size'] : '';
-				$value = (array_key_exists('answer', $field)) ? $field['answer'] : '';
-				$inputField = sprintf(
-					'<input type="text" name="answers[]" value="%s" class="%s" />',
-					$value,
-					$class
-				);
-				
-				// Insert input field
-				$text = mb_substr($text, 0, $posStart, 'UTF-8') . $inputField . mb_substr($text, $posEnd, mb_strlen($text)-$posEnd, 'UTF-8');
-			}
-		?>
-		<?=$text?>
+		<?php $posStart = 0; ?>
+		<?php foreach($fields as &$field) : ?>
+		<?php $posEnd = mb_strpos($task['text'], '[textinput]', $posStart, 'UTF-8'); ?>
+		<?=$t->t(mb_substr($task['text'], $posStart, $posEnd-$posStart, 'UTF-8'))?>
+		<input type="text" name="answers[]" value="<?=(array_key_exists('answer', $field)) ? $field['answer'] : ''?>" <?php if($field['size'] != 'default') : ?>class="<?=$field['size']?>"<?php endif ?> />
+		<?php $posStart = $posEnd + mb_strlen('[textinput]', 'UTF-8'); ?>
+		<?php endforeach ?>
+		<?=$t->t(mb_substr($task['text'], $posStart, mb_strlen($task['text'], 'UTF-8')-$posStart, 'UTF-8'))?>
 	</p>
 	<input type="submit" name="submit" value="<?=_('solve')?>" />
 </form>
diff --git a/questtypes/textinput/html/submission.tpl b/questtypes/textinput/html/submission.tpl
index e75b2c4d..20abb2bb 100644
--- a/questtypes/textinput/html/submission.tpl
+++ b/questtypes/textinput/html/submission.tpl
@@ -1,24 +1,10 @@
 <p>
-	<?php
-		$text = $t->t($task['text']);
-		
-		// Insert Character answers
-		foreach(array_reverse($fields) as &$field)
-		{
-			// Get positions
-			$posStart = mb_strrpos($text, '[textinput]', 0, 'UTF-8');
-			$posEnd = $posStart + mb_strlen('[textinput]', 'UTF-8');
-			
-			// Create field for Character answer
-			$answerField = sprintf(
-				'<span style="background-color:grey">%s</span>%s',
-				$field['answer'],
-				($field['right']) ? '✓' : '✕'
-			);
-			
-			// Insert input field
-			$text = mb_substr($text, 0, $posStart, 'UTF-8') . $answerField . mb_substr($text, $posEnd, mb_strlen($text)-$posEnd, 'UTF-8');
-		}
-	?>
-	<?=$text?>
+	<?php $posStart = 0; ?>
+	<?php foreach($fields as &$field) : ?>
+	<?php $posEnd = mb_strpos($task['text'], '[textinput]', $posStart, 'UTF-8'); ?>
+	<?=$t->t(mb_substr($task['text'], $posStart, $posEnd-$posStart, 'UTF-8'))?>
+	<span style="background-color:grey"><?=$field['answer']?></span><?=($field['right']) ? '✓' : '✕'?>
+	<?php $posStart = $posEnd + mb_strlen('[textinput]', 'UTF-8'); ?>
+	<?php endforeach ?>
+	<?=$t->t(mb_substr($task['text'], $posStart, mb_strlen($task['text'], 'UTF-8')-$posStart, 'UTF-8'))?>
 </p>