diff --git a/static/templates/search_operators.hbs b/static/templates/search_operators.hbs
index 778de400af..2f58722346 100644
--- a/static/templates/search_operators.hbs
+++ b/static/templates/search_operators.hbs
@@ -9,6 +9,15 @@
                     </tr>
                 </thead>
                 <tbody>
+                    <tr>
+                        <td class="operator"><span class="operator_value">keyword</span></td>
+                        <td class="definition">
+                            {{#tr}}
+                                Search for <z-value></z-value> in the topic or message content.
+                                {{#*inline "z-value"}}<span class="operator_value">keyword</span>{{/inline}}
+                            {{/tr}}
+                        </td>
+                    </tr>
                     <tr>
                         <td class="operator">stream:<span class="operator_value">stream</span></td>
                         <td class="definition">
@@ -27,6 +36,12 @@
                             {{/tr}}
                         </td>
                     </tr>
+                    <tr>
+                        <td class="operator">is:private</td>
+                        <td class="definition">
+                            {{t 'Narrow to private messages.'}}
+                        </td>
+                    </tr>
                     <tr>
                         <td class="operator">pm-with:<span class="operator_value">user</span></td>
                         <td class="definition">
@@ -45,6 +60,12 @@
                             {{/tr}}
                         </td>
                     </tr>
+                    <tr>
+                        <td class="operator">streams:public</td>
+                        <td class="definition">
+                            {{t 'Search all public streams in the organization.'}}
+                        </td>
+                    </tr>
                     <tr>
                         <td class="operator">sender:<span class="operator_value">user</span></td>
                         <td class="definition">
@@ -60,6 +81,54 @@
                             {{t 'Narrow to messages sent by you.'}}
                         </td>
                     </tr>
+                    <tr>
+                        <td class="operator">has:link</td>
+                        <td class="definition">
+                            {{t 'Narrow to messages containing links.'}}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="operator">has:attachment</td>
+                        <td class="definition">
+                            {{t 'Narrow to messages containing uploads.'}}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="operator">has:image</td>
+                        <td class="definition">
+                            {{t 'Narrow to messages containing images.'}}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="operator">is:alerted</td>
+                        <td class="definition">
+                            {{t 'Narrow to messages with alert words.'}}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="operator">is:mentioned</td>
+                        <td class="definition">
+                            {{t 'Narrow to messages that mention you.'}}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="operator">is:starred</td>
+                        <td class="definition">
+                            {{t 'Narrow to starred messages.'}}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="operator">is:resolved</td>
+                        <td class="definition">
+                            {{t 'Narrow to messages in resolved topics.'}}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="operator">is:unread</td>
+                        <td class="definition">
+                            {{t 'Narrow to unread messages.'}}
+                        </td>
+                    </tr>
                     <tr>
                         <td class="operator">near:<span class="operator_value">id</span></td>
                         <td class="definition">
@@ -78,75 +147,6 @@
                             {{/tr}}
                         </td>
                     </tr>
-                    <tr>
-                        <td class="operator">streams:public</td>
-                        <td class="definition">
-                            {{t 'Search all public streams in the organization.'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="operator">is:alerted</td>
-                        <td class="definition">
-                            {{t 'Narrow to messages with alert words.'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="operator">is:mentioned</td>
-                        <td class="definition">
-                            {{t 'Narrow to messages that mention you.'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="operator">is:private</td>
-                        <td class="definition">
-                            {{t 'Narrow to private messages.'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="operator">is:starred</td>
-                        <td class="definition">
-                            {{t 'Narrow to starred messages.'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="operator">is:unread</td>
-                        <td class="definition">
-                            {{t 'Narrow to unread messages.'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="operator">is:resolved</td>
-                        <td class="definition">
-                            {{t 'Narrow to messages in resolved topics.'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="operator">has:link</td>
-                        <td class="definition">
-                            {{t 'Narrow to messages containing links.'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="operator">has:image</td>
-                        <td class="definition">
-                            {{t 'Narrow to messages containing images.'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="operator">has:attachment</td>
-                        <td class="definition">
-                            {{t 'Narrow to messages containing uploads.'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="operator"><span class="operator_value">keyword</span></td>
-                        <td class="definition">
-                            {{#tr}}
-                                Search for <z-value></z-value> in the topic or message content.
-                                {{#*inline "z-value"}}<span class="operator_value">keyword</span>{{/inline}}
-                            {{/tr}}
-                        </td>
-                    </tr>
                     <tr>
                         <td class="operator">-topic:<span class="operator_value">topic</span></td>
                         <td class="definition">