diff --git a/development/common/logs_utils.py b/development/common/logs_utils.py
index d790b7b..da7f3d7 100644
--- a/development/common/logs_utils.py
+++ b/development/common/logs_utils.py
@@ -13,7 +13,8 @@ def __init__(self, data: list) -> None:
 
     @property
     def possible_states(self) -> list:
-        possible_states = [log[STATE] for log in self.logs if STATE in log.keys()]
+        possible_states = [log[STATE] for log in self.logs
+                           if STATE in log.keys() and log[STATE] != "gameover"]
         possible_states.append(ALL_STATES)
         return list(set(possible_states))
 
diff --git a/development/templates/development/new_match_details.html b/development/templates/development/new_match_details.html
index c805907..eaf9166 100644
--- a/development/templates/development/new_match_details.html
+++ b/development/templates/development/new_match_details.html
@@ -31,16 +31,14 @@ <h1>Match details</h1>
                   <select class="form-control" name="valid_move" id="valid_move">
                     <optgroup label="Validity">
                         {% for states in move_states %}
-                          {% if states != "gameover" %}
-                            <option value="{{ states }}">{{ states|title }}</option>
-                          {% endif %}
+                          <option value="{{ states }}">{{ states|title }}</option>
                         {% endfor %}
                     </optgroup>
                   </select>
               </div>
               <div class="col">
                 <label for="action_kind">Kind of action</label>
-                  <select class="form-control" name="valid_move" id="action_kind">
+                  <select class="form-control" name="action_kind" id="action_kind">
                     <optgroup label="Kind of action">
                         {% for kind in actions_kind %}
                         <option value="{{ kind }}">{{ kind|title }}</option>