-<form method="post" enctype="multipart/form-data" action="<<CgiVar|QUERY_STRING>>" >
-<input type="hidden" name="edit2" value="<<HttpGet|edit2>>">
-<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100"><<HttpPost|savetext>></textarea>
-Or upload a file: <input type="file" name="file" value="<<HttpPost|file>>" />
+<form method="post" enctype="multipart/form-data" action="<<CgiVar|SCRIPT_NAME>>/<<CgiVar|QUERY_STRING>>" >
+<input type="hidden" name="a" value="edit">
+<input type="hidden" name="q" value="<<HttpGet|q>>">
+<textarea wrap="off" autofocus="true" spellcheck="true" class="editor" name="savetext" rows="17" cols="100" accesskey="e"><<EDIT_BODY>></textarea>
+<label for="file" accesskey="u">Or upload a file:</label> <input type="file" name="file" value="<<HttpPost|file>>" />