diff --git a/kanken_online/templates/search/search.html b/kanken_online/templates/search/search.html
index 34ff8d0..ae2256d 100644
--- a/kanken_online/templates/search/search.html
+++ b/kanken_online/templates/search/search.html
@@ -7,12 +7,40 @@
 {% block content %}
   <form method="get">
     <label for="search_bar">{{ localize("search") }}</label>
-    <input type="text" id="search_bar" name="keywords" placeholder="{{ localize('search_placeholder') }}" value="{{ value }}">
-    <label for="include_kanji">{{ localize("include_kanji") }}</label>
-    <input type="checkbox" id="include_kanji" checked>
-    <label for="include_kanji">{{ localize("include_kotoba") }}</label>
-    <input type="checkbox" id="include_kanji" checked>
-  </form>
+    <input type="text" id="search_bar" name="keywords" placeholder="{{ localize('search_placeholder') }}" value="{{ value }}" autofocus onfocus="this.select()">
+    
+    <fieldset>
+    <label for="search_method_includes">Includes</label>
+    <input type="radio" id="search_method_includes" name="search_method" value="includes">
+    <label for="search_method_includes">Matches</label>
+    <input type="radio" id="search_method_matches" name="search_method" value="matches">
+    <label for="search_method_includes">Starts with</label>
+    <input type="radio" id="search_method_starts_with" name="search_method" value="starts_with">
+    <label for="search_method_includes">Ends with</label>
+    <input type="radio" id="search_method_ends_with" name="search_method" value="ends_with">
+    <label for="search_method_regex">Regular expression</label>
+    <input type="radio" id="search_method_regex" name="search_method" value="regex">
+    </fieldset>
+    
+    <input type="text" id="onkun" name="onkun" placeholder="midashi onkun">
+    <input type="text" id="kanji_goon" name="goon" placeholder="goon">
+    <input type="text" id="kanji_kanon" name="kanon" placeholder="kanon">
+    <input type="text" id="kanji_soon" name="soon" placeholder="soon">
+    <input type="text" id="kanji_toon" name="toon" placeholder="toon">
+    <input type="text" id="kanji_kanyoon" name="kanyoon" placeholder="kanyoon">
+    <input type="text" id="kanji_kun" name="kun" placeholder="kun">
+    <input type="text" id="radical" name="radical" placeholder="radical">
+    <input type="text" id="stroke_min" name="stroke_min" placeholder="min stroke count">
+    <input type="text" id="stroke_max" name="stroke_max" placeholder="max stroke count">
+    <input type="text" id="level_min" name="level_min" placeholder="min level">
+    <input type="text" id="level_max" name="level_max" placeholder="max level">
+    
+    <label for="kokuji">kokuji</label>
+    <select name="kokuji" id="kokuji">
+      <option value="include">include</option>
+      <option value="exclude">exclude</option>
+    </select>
+    </form>
   {% block results %}
   {% endblock %}
 {% endblock %}
\ No newline at end of file