diff --git a/extras/imported/html-mode/Insert Tag/Input with Label.yasnippet b/extras/imported/html-mode/Insert Tag/Input with Label.yasnippet
index 3c53829..a87fbcf 100644
--- a/extras/imported/html-mode/Insert Tag/Input with Label.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/Input with Label.yasnippet	
@@ -4,6 +4,4 @@
 # name: Input with Label
 ## condition: "text.html"
 # --
-<label for="${2:id$(yas/get-field-once 1 #'yas/html-id-from-string)}">$1</label><input type="${3:$$(yas/choose-value '("text" "submit" "hidden" "button"))}" name="${4:name$(
-                    yas/get-field-once 2)}" value="$5"${6: id="${7:id$(
-                    yas/get-field-once 2)}"}`yas/html-xhtml-attr`>
\ No newline at end of file
+<label for="${2:${1:$(yas/html-id-from-string yas/text)}}">${1:}</label><input type="${3:$$(yas/choose-value '("text" "submit" "hidden" "button"))}" name="${4:$2}" value="$5"${6: id="${7:$2}"}`yas/html-xhtml-attr`>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/Select Box.yasnippet b/extras/imported/html-mode/Insert Tag/Select Box.yasnippet
index b6363d9..f1bc745 100644
--- a/extras/imported/html-mode/Insert Tag/Select Box.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/Select Box.yasnippet	
@@ -4,8 +4,8 @@
 # name: Select Box
 ## condition: "text.html"
 # --
-<select name="${1:some_name}" id="${2:id$(yas/get-field-once 1)}"${3:${4: multiple}${5: onchange="$6"}${7: size="${8:1}"}}>
-	<option${9: value="${10:option1}"}>${11:$$(yas/get-field-once 10)}</option>
-	<option${12: value="${13:option2}"}>${14:$$(yas/get-field-once 13)}</option>$15
+<select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: onchange="$6"}${7: size="${8:1}"}}>
+	<option${9: value="${10:option1}"}>${11:$10}</option>
+	<option${12: value="${13:option2}"}>${14:$13}</option>$15
 	$0
 </select>
\ No newline at end of file
diff --git a/extras/imported/html-mode/Insert Tag/XHTML input.yasnippet b/extras/imported/html-mode/Insert Tag/XHTML input.yasnippet
index 097b1da..a9ec40e 100644
--- a/extras/imported/html-mode/Insert Tag/XHTML input.yasnippet	
+++ b/extras/imported/html-mode/Insert Tag/XHTML input.yasnippet	
@@ -3,4 +3,4 @@
 # name: Input
 ## condition: "text.html"
 # --
-<input type="${1:$$(yas/choose-value '("text" "submit" "hidden" "button"))}" name="${2:some_name}" value="$3"${4: id="${5:$$(yas/get-field-once 2)}"}`yas/html-xhtml-attr`>
\ No newline at end of file
+<input type="${1:$$(yas/choose-value '("text" "submit" "hidden" "button"))}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}`yas/html-xhtml-attr`>
\ No newline at end of file