diff --git a/APPL/PRS/prs_phonebook.asp b/APPL/PRS/prs_phonebook.asp
index 9b78c3876a..e6bd472c1d 100644
--- a/APPL/PRS/prs_phonebook.asp
+++ b/APPL/PRS/prs_phonebook.asp
@@ -1,7 +1,7 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 13-10-09 18:48 $
+     $Revision: 2 $
+     $Modtime: 26-10-09 21:04 $
 
     File:        prs_phonebook.asp (formerly phone_book.asp;29)
     Status:      80%
@@ -66,17 +66,65 @@ FCLTHeader.Requires({plugins:["jQuery", "kenmerk"],
  </head>
   <body id="searchbody">
     <div id="search">
-<%    BLOCK_START("searchtable", lcl_filterblok);%>
+<%    BLOCK_START("searchtable", lcl_filterblok + " <span id='phonebookteaser'>" + prs_phonebook_info + "</span>");%>
       <form method=get action="prs_phonebook_list.asp" target=workFrame name="u2" onsubmit='startSearch(1);return false'>
         <tr>
             <td class="searchkolom1">
               <table><!-- x rijen, 2 kolommen: label + veld -->
               <tr class="primsearch">
                 <td class="label">
-                    <input type=hidden name=mode>
-                    <label for="companyName"><%=lcl_name%>:</label></td>
-                <td><input type="text" class="fld wildcard" name="Naam"></td>
+                    <input type="hidden" name="mode"><input type="submit" style="width:0px">
+                    <label for="naam"><%=lcl_name%>:</label></td>
+                <td><input type="text" class="fld wildcard" id="naam" name="Naam"></td>
               </tr>
+              <tr class="primsearch">
+                <td class="label"><label for="telefoon"><%=lcl_pb_phone%>:</label></td>
+                <td><input type="text" class="fld wildcard" id="telefoon" name="Telefoon"></td>
+              </tr>
+<%                  
+        if (prs_plaats_key == -1) // Gewone locatie listbox
+        {
+                    FCLTplaatsselector(authparams.PRSreadlevel, { locatiekey: null,
+                                                                  startlevel: 2, // locatie
+                                                                  eindlevel: 4, // verdieping
+                                                                  whenEmpty: lcl_search_generic  // want filter
+                                                                });
+        } else {
+%>
+              <tr class="primsearch">
+                <td class="label"><label for="place"><%=lcl_location%>:</label></td>
+                <td><input type="text" class="fld wildcard" name="place"></td>
+              </tr>
+<%                  
+        }
+%>
+              </table>
+            </td><!-- end column 1 -->
+
+            <!-- Second column -->
+            <td class="searchkolom2">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+              <tr class="primsearch"><%
+                // TODO: ook de autorisatie betrekken (bedenk: bedrijf "Boventallig?")
+        FCLTselector("bedrijf", "select prs_bedrijf_key, prs_bedrijf_naam FROM prs_v_aanwezigbedrijf where prs_bedrijf_intern=1 ORDER BY 2",
+                        { label: lcl_company,
+                          emptyOption: "",
+                          whenEmpty: lcl_search_generic  // want filter
+                        }
+                      )
+            %></tr><tr><%
+   for( i=1; i<=prs_max_dep_level; i++ ) {
+        FCLTafdelingselector("niv"+i, "niv"+i,
+                            {label: eval("lcl_dep_name_level"+""+i),
+                            filtercode: i,
+                          whenEmpty: lcl_search_generic  // want filter
+                            })
+           %></tr><%
+   }
+           %><tr class="primsearch">
+                <td class="label"><label for="nivwc"><%=lcl_pb_organization %>:</label></td>
+                <td><input type="text" class="fldsrch wildcard" id="nivwc" name="nivwc" value=""></td>
+            </tr>
 <% if (phone_show_functie) { %><tr><%
 
             sql = "SELECT prs_srtperslid_key, prs_srtperslid_omschrijving, prs_srtperslid_upper"
@@ -89,54 +137,10 @@ FCLTHeader.Requires({plugins:["jQuery", "kenmerk"],
  %></tr><%
 }
 %>
-              <tr class="primsearch">
-                <td class="label"><label for="Telefoon"><%=lcl_pb_phone%>:</label></td>
-                <td><input type="text" class="fld wildcard" name="Telefoon"></td>
-              </tr>
-<%                  
-        if (prs_plaats_key == -1) // Gewone locatie listbox
-        {
-              %><tr class="primsearch"><%
-                    FCLTplaatsselector(authparams.PRSreadlevel, { locatiekey: null,
-                                                                  startlevel: 2, // locatie
-                                                                  eindlevel: 4, // verdieping
-                                                                  whenEmpty: lcl_search_generic  // want filter
-                                                                });
-            %></tr><%
-        }
-%>
-              </table>
-            </td><!-- end column 1 -->
-
-            <!-- Second column -->
-            <td class="searchkolom2">
-              <table><!-- x rijen, 2 kolommen: label + veld -->
-              <tr class="primsearch"><%
-        FCLTselector("bedrijf", "select prs_bedrijf_key, prs_bedrijf_naam FROM prs_v_aanwezigbedrijf where prs_bedrijf_intern=1 ORDER BY 2",
-                        { label: lcl_company,
-                          emptyOption: "",
-                          whenEmpty: lcl_search_generic  // want filter
-                        }
-                      )
-            %></tr><tr><%
-   for( i=1; i<=prs_max_dep_level; i++ ) {
-        FCLTafdelingselector("niv"+i, "niv"+i,
-                            {label: eval("lcl_dep_name_level"+""+i),
-                            filtercode: i
-                            })
-           %></tr><%
-   }
-           %><tr class="primsearch">
-                <td class="label"><label for="nivwc"><%=lcl_pb_organization %>:</label></td>
-                <td><input type="text" class="fldsrch wildcard" name="nivwc" value=""></td>
-            </tr>
               </table>
             </td><!-- end column 2-->
           </tr>
         </table>
-        <input type="submit" style="width:0px">
-<!-- CUST specific announcement (optional) -->
-<center><% =prs_phonebook_info %></center>
       </form>
 <%    BLOCK_END();
 
