diff --git a/app/views/org_admin/question_options/_option_fields.html.erb b/app/views/org_admin/question_options/_option_fields.html.erb
index 63cd834..1bb60f2 100644
--- a/app/views/org_admin/question_options/_option_fields.html.erb
+++ b/app/views/org_admin/question_options/_option_fields.html.erb
@@ -21,7 +21,7 @@
     <% options_q.number = i %>
     <div class="row" data-attribute="question_option">
       <div class="col-md-3">
-        <%= op.number_field :number, in: 1..20, class: 'form-control' %>
+        <%= op.number_field :number, min: 1, class: 'form-control' %>
       </div>
       <div class="col-md-3">
         <%= op.text_field :text, as: :string, class: 'form-control' %>
diff --git a/lib/assets/javascripts/views/org_admin/question_options/index.js b/lib/assets/javascripts/views/org_admin/question_options/index.js
index 0b939b9..19ec44d 100644
--- a/lib/assets/javascripts/views/org_admin/question_options/index.js
+++ b/lib/assets/javascripts/views/org_admin/question_options/index.js
@@ -11,7 +11,8 @@
     const source = e.target;
     const last = $(source).closest('[data-attribute="question_options"]').find('[data-attribute="question_option"]').last();
     const cloned = last.clone(true);
-    const array = $(cloned).find('[id$="_number"]').prop('id').match(/_[\d]_+/);
+    const array = $(cloned).find('[id$="_number"]').prop('id').match(/_[\d]*?_+/);
+
     if (array) {
       const index = Number(array[0].replace(/_/g, ''));
       // Reset values for the new cloned inputs