diff --git a/app/Lib/lang.php b/app/Lib/lang.php
index 4405258c0..1863c85d8 100644
--- a/app/Lib/lang.php
+++ b/app/Lib/lang.php
@@ -164,6 +164,7 @@
   'ct.navigation_links.1' =>    'Navigation Link',
   'ct.navigation_links.pl' =>   'Navigation Links',
   'ct.org_identities.1' =>      'Organizational Identity',
+  'ct.org_identities.fi' =>     'Organizational Identity Filter',
   'ct.org_identities.se' =>     'Organizational Identity Search',
   'ct.org_identities.pl' =>     'Organizational Identities',
   'ct.org_identity_sources.1' => 'Organizational Identity Source',
@@ -1033,6 +1034,7 @@
   'fd.cou-a' =>       '%1$s COU',
   'fd.co_group.auto' => 'Automatic',
   'fd.co_group.group_type' => 'Group Type',
+  'fd.co_people.filter' => 'CO Person Filter',
   'fd.co_people.search' => 'CO Person Search',
   'fd.co_people.status' => 'CO Person Status',
   'fd.created' =>     'Created',
diff --git a/app/View/CoPeople/search-side.inc b/app/View/CoPeople/search-side.inc
index 8c147a767..cb30b5c12 100644
--- a/app/View/CoPeople/search-side.inc
+++ b/app/View/CoPeople/search-side.inc
@@ -33,7 +33,7 @@ global $cm_lang, $cm_texts;
 <div id="coPeopleSimpleSearch" class="side-search">
   <div class="accHeader">
     <em class="material-icons">search</em>
-    <?php print _txt('fd.co_people.search');?>
+    <?php print _txt('fd.co_people.filter');?>
   </div>
   <?php
     print $this->Form->create('CoPerson', array('url' => array('action'=>'search')));
@@ -93,7 +93,7 @@ global $cm_lang, $cm_texts;
     //$this->Form->submit(_txt('op.search'));
     print '<div class="sideSearchSubmit">';
     $args = array();
-    $args['aria-label'] = _txt('op.search');
+    $args['aria-label'] = _txt('op.filter');
     $args['class'] = 'submit-button spin mdl-button mdl-js-button mdl-button--raised mdl-button--colored mdl-js-ripple-effect';
     print $this->Form->submit(_txt('op.search'),$args);
     print '</div>';
diff --git a/app/View/CoPeople/search.inc b/app/View/CoPeople/search.inc
index 0836320b0..5b4c8a2ed 100644
--- a/app/View/CoPeople/search.inc
+++ b/app/View/CoPeople/search.inc
@@ -73,7 +73,7 @@ global $cm_lang, $cm_texts;
     <legend>
       <a href="#" id="top-search-toggle">
         <em class="material-icons">search</em>
-        <?php print _txt('op.search');?>
+        <?php print _txt('op.filter');?>
         <em class="material-icons drop-arrow">arrow_drop_down</em>
       </a>
     </legend>
@@ -150,9 +150,9 @@ global $cm_lang, $cm_texts;
         //$args['type'] = 'button';
 
         // search button (submit)
-        $args['aria-label'] = _txt('op.search');
+        $args['aria-label'] = _txt('op.filter');
         $args['class'] = 'submit-button spin mdl-button mdl-js-button mdl-button--raised mdl-button--colored mdl-js-ripple-effect';
-        print $this->Form->submit(_txt('op.search'),$args);
+        print $this->Form->submit(_txt('op.filter'),$args);
 
         // clear button
         $args['class'] = 'clear-button spin mdl-button';
diff --git a/app/View/OrgIdentities/search-side.inc b/app/View/OrgIdentities/search-side.inc
index 907538ca3..0196e9003 100644
--- a/app/View/OrgIdentities/search-side.inc
+++ b/app/View/OrgIdentities/search-side.inc
@@ -52,7 +52,7 @@ global $cm_lang, $cm_texts;
 </script>
 
 <div id="advancedSearch">
-  <h3><?php print _txt('ct.org_identities.se');?></h3>
+  <h3><?php print _txt('ct.org_identities.fi');?></h3>
   <div>
     <?php 
       print $this->Form->create('OrgIdentity',array('url' => array('action'=>'search')));
@@ -134,7 +134,7 @@ global $cm_lang, $cm_texts;
       </tr>
       <tr>
         <td>
-          <?php print $this->Form->submit(_txt('op.search')); ?>
+          <?php print $this->Form->submit(_txt('op.filter')); ?>
         </td>
       </tr>
     </table>
diff --git a/app/View/OrgIdentities/search.inc b/app/View/OrgIdentities/search.inc
index 37da86868..eb8f35565 100644
--- a/app/View/OrgIdentities/search.inc
+++ b/app/View/OrgIdentities/search.inc
@@ -74,7 +74,7 @@ $tabIndex = 1;
     <legend>
       <a href="#" id="top-search-toggle">
         <em class="material-icons">search</em>
-        <?php print _txt('op.search');?>
+        <?php print _txt('op.filter');?>
         <em class="material-icons drop-arrow">arrow_drop_down</em>
       </a>
     </legend>
@@ -163,9 +163,9 @@ $tabIndex = 1;
         //$args['type'] = 'button';
 
         // search button (submit)
-        $args['aria-label'] = _txt('op.search');
+        $args['aria-label'] = _txt('op.filter');
         $args['class'] = 'submit-button spin mdl-button mdl-js-button mdl-button--raised mdl-button--colored mdl-js-ripple-effect';
-        print $this->Form->submit(_txt('op.search'),$args);
+        print $this->Form->submit(_txt('op.filter'),$args);
 
         // clear button
         $args['class'] = 'clear-button spin mdl-button';