diff --git a/tabellio/searchform/form.py b/tabellio/searchform/form.py
index e106abb..3ac6eb8 100644
--- a/tabellio/searchform/form.py
+++ b/tabellio/searchform/form.py
@@ -445,16 +445,20 @@ class QuestionSearchForm(form.Form):
 
 class QuestionPfbSearchForm(QuestionSearchForm):
     fields = field.Fields(IQuestionSearch)
+    fields['authors'].title = _(u'Author(s)')
     fields['sort_on'].widgetFactory = FieldRadioboxesWidget
 
+    @button.buttonAndHandler(_(u'Submit'))
+    def handleApply(self, action):
+        pass
 
 class IDocumentPfbSearch(interface.Interface):
     search_type_is_document = schema.TextLine(title=u'Search Type', default=u'1')
 
-    l_doctypes = schema.List(title=_(u'Document Types'), required=False,
-                    value_type=schema.Choice(title=_(u'Document Type'), required=False,
+    l_doctypes = schema.List(title=_(u'Type'), required=False,
+                    value_type=schema.Choice(title=_(u'Type'), required=False,
                             source=possible_document_types))
-    authors = schema.TextLine(title=_(u'Authors'), required=False)
+    authors = schema.TextLine(title=_(u'Author(s)'), required=False)
     #l_polgroups = schema.List(title=_(u'Political Groups'), required=False,
     #                value_type=schema.Choice(title=_(u'Political Group'),
     #                required=False, source=possible_polgroups))
@@ -491,7 +495,7 @@ class DocumentPfbSearchForm(form.Form):
         super(DocumentPfbSearchForm, self).updateWidgets()
         self.widgets['search_type_is_document'].mode = z3c.form.interfaces.HIDDEN_MODE
 
-    @button.buttonAndHandler(_(u'Search'))
+    @button.buttonAndHandler(_(u'Submit'))
     def handleApply(self, action):
         pass
 
@@ -499,10 +503,10 @@ class DocumentPfbSearchForm(form.Form):
 class IAdoptedDocumentPfbSearch(interface.Interface):
     search_type_is_adopteddocument = schema.TextLine(title=u'Search Type', default=u'1')
 
-    l_doctypes = schema.List(title=_(u'Document Types'), required=False,
-                    value_type=schema.Choice(title=_(u'Document Type'), required=False,
+    l_doctypes = schema.List(title=_(u'Type'), required=False,
+                    value_type=schema.Choice(title=_(u'Type'), required=False,
                             values=[_(u'Projets'), _(u'Propositions')]))
-    authors = schema.TextLine(title=_(u'Authors'), required=False)
+    authors = schema.TextLine(title=_(u'Author(s)'), required=False)
     #l_polgroups = schema.List(title=_(u'Political Groups'), required=False,
     #                value_type=schema.Choice(title=_(u'Political Group'),
     #                required=False, source=possible_polgroups))
@@ -539,7 +543,7 @@ class AdoptedDocumentPfbSearchForm(form.Form):
         self.widgets['adopted'].mode = z3c.form.interfaces.HIDDEN_MODE
         self.widgets['search_type_is_adopteddocument'].mode = z3c.form.interfaces.HIDDEN_MODE
 
-    @button.buttonAndHandler(_(u'Search'))
+    @button.buttonAndHandler(_(u'Submit'))
     def handleApply(self, action):
         pass