diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index f3865d485f..d610750fa4 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -16,7 +16,7 @@ include '../../common/view/datepicker.html.php';
 include '../../common/view/chosen.html.php';
 $formId = 'searchForm-' . uniqid('');
 $fieldWidth    = $app->getClientLang() == 'en' ? 'w-130px' : 'w-110px';
-$operatorWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-100px';
+$operatorWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-90px';
 ?>
 <style>
 #selectPeriod {padding: 4px 0; height: 197px; min-width: 120px}
@@ -26,7 +26,11 @@ $operatorWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-100px';
 #<?php echo $formId;?> > table > tbody > tr > td {padding: 8px;}
 #<?php echo $formId;?> .form-actions {padding-bottom: 20px; padding-top: 0;}
 #<?php echo $formId;?> .chosen-container[id^="field"] .chosen-drop {min-width: 180px;}
+<?php if($app->getClientLang() == 'en'):?>
+#<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-single {min-width: 70px;}
+<?php else:?>
 #<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-single {min-width: 100px;}
+<?php endif;?>
 #<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-drop {min-width: 300px;}
 #<?php echo $formId;?> .chosen-container .chosen-drop ul.chosen-results li {white-space:normal}
 #<?php echo $formId;?> input.date::-webkit-input-placeholder {color: #838A9D; opacity: 1;}
@@ -36,6 +40,10 @@ $operatorWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-100px';
 #<?php echo $formId;?> .btn-expand-form:hover {background: #e9f2fb;}
 .showmore .btn-expand-form .icon-chevron-double-down:before {content: '\e959';}
 
+#queryBox select[id^="operator"] {padding-right:2px; padding-left:5px;}
+#queryBox select#groupAndOr {padding-right:2px; padding-left:5px;}
+#queryBox .chosen-container-single .chosen-single>span {margin-right:5px;}
+
 #userQueries {border-left: 1px solid #eee; vertical-align: top;}
 #userQueries > h4 {margin: 0 0 6px;}
 #userQueries ul {list-style: none; padding-left: 0; margin: 0; max-height:75px; overflow:auto;}
@@ -131,7 +139,7 @@ foreach($fieldParams as $fieldName => $param)
           </tbody>
         </table>
       </td>
-      <td class='text-center nobr w-80px'><?php echo html::select('groupAndOr', $lang->search->andor, $formSession['groupAndOr'], "class='form-control'")?></td>
+      <td class='text-center nobr w-70px'><?php echo html::select('groupAndOr', $lang->search->andor, $formSession['groupAndOr'], "class='form-control'")?></td>
       <td class='w-400px'>
         <table class='table table-form'>
           <tbody>
diff --git a/module/task/js/create.js b/module/task/js/create.js
index 15bd0236ea..faa05fc6c6 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -259,12 +259,12 @@ function addItem(obj)
     var $nextTr = $tr.next();
     $nextTr.find('#testAssignedTo').val($('#assignedTo').val());
     $nextTr.find('#testStory').closest('td').find('.chosen-container').remove();
-    $nextTr.find('#testStory').closest('td').find('select').chosen();
+    $nextTr.find('#testStory').closest('td').find('select').val('').chosen();
     $nextTr.find('#testPri').closest('td').find('.chosen-container').remove();
     $nextTr.find('#testPri').closest('td').find('select').chosen();
     $nextTr.find('#testAssignedTo').closest('td').find('.chosen-container').remove();
     $nextTr.find('#testAssignedTo').closest('td').find('select').chosen();
-    $nextTr.find('.form-date').datepicker();
+    $nextTr.find('.form-date').val('').datepicker();
 }
 
 function removeItem(obj)
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 212900bb87..d28a0e593c 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -115,6 +115,27 @@
                 <?php $i++;?>
                 <?php if($i >= 5) break;?>
                 <?php endforeach;?>
+                <?php if($i == 0):?>
+                <tr>
+                  <td><?php echo html::select("testStory[]", $stories, '', "class='form-control chosen'");?></td>
+                  <td><?php echo html::select("testPri[]", $lang->task->priList, $task->pri, "class='form-control chosen'");?></td>
+                  <td>
+                    <div class='input-group'>
+                      <?php echo html::input("testEstStarted[]", $task->estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?>
+                      <span class='input-group-addon fix-border'>~</span>
+                      <?php echo html::input("testDeadline[]", $task->deadline, "class='form-control form-date' placeholder='{$lang->task->deadline}'");?>
+                    </div>
+                  </td>
+                  <td><?php echo html::select("testAssignedTo[]", $members, $task->assignedTo, "class='form-control chosen'");?></td>
+                  <td><?php echo html::input("testEstimate[]", '', "class='form-control'");?></td>
+                  <td class='text-center'>
+                    <div class="btn-group">
+                      <button type="button" class="btn btn-sm" tabindex="-1" onclick='addItem(this)'><i class="icon icon-plus"></i></button>
+                      <button type="button" class="btn btn-sm" tabindex="-1" onclick='removeItem(this)'><i class="icon icon-close"></i></button>
+                    </div>
+                  </td>
+                </tr>
+                <?php endif;?>
               </tbody>
             </table>
           </td>