diff --git a/android/res/layout/tcqueryform.xml b/android/res/layout/tcqueryform.xml
index 3c6d63332..fe37d805d 100644
--- a/android/res/layout/tcqueryform.xml
+++ b/android/res/layout/tcqueryform.xml
@@ -16,53 +16,62 @@
         android:id="@+id/tableLayout1"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:stretchColumns="1" >
+       >
 
         <TableRow>
 
             <TextView
                 android:id="@+id/textView1"
-                android:text="@string/motor_manufacturer" />
+                android:text="@string/motor_manufacturer"
+                android:layout_weight="0" />
 
             <Spinner
                 android:id="@+id/TCMotorSearchFormManufacturerField"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:entries="@array/TCMotorSearchManufacturerList" />
         </TableRow>
 
         <TableRow>
 
             <TextView
-                android:text="@string/motor_impulseclass" />
+                android:text="@string/motor_impulseclass" 
+                android:layout_weight="0"/>
 
             <Spinner
                 android:id="@+id/TCMotorSearchFormImpulseField"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:entries="@array/TCMotorSearchImpulseList" />
         </TableRow>
 
         <TableRow>
 
             <TextView
-                android:text="@string/motor_commonname" />
+                android:text="@string/motor_commonname" 
+                android:layout_weight="0"/>
 
             <EditText
                 android:inputType="text"
                 android:id="@+id/TCMotorSearchFormCommonNameField"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:text="" />
         </TableRow>
 
         <TableRow>
 
             <TextView
-                android:text="@string/motor_diameter" />
+                android:text="@string/motor_diameter" 
+                android:layout_weight="0"/>
 
             <Spinner
                 android:id="@+id/TCMotorSearchFormDiameterField"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:entries="@array/TCMotorSearchDiameterList" />
         </TableRow>
     </TableLayout>