diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html
index 1faf2fe73f..f47f379b11 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html
@@ -32,7 +32,7 @@
                 <th>Base URL</th>
             </tr>
             </thead>
-            <tfoot data-ng-show="applications && applications.length > 5"> <!-- todo -->
+            <!--<tfoot data-ng-show="applications && applications.length > 5">
             <tr>
                 <td colspan="3">
                     <div class="table-nav">
@@ -43,7 +43,7 @@
                     </div>
                 </td>
             </tr>
-            </tfoot>
+            </tfoot>-->
             <tbody>
             <tr ng-repeat="app in applications | filter:search">
                 <td><a href="#/realms/{{realm.realm}}/applications/{{app.name}}">{{app.name}}</a></td>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html
index 6ce67e3fe7..477e861ea3 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html
@@ -30,7 +30,7 @@
                     </div>
                 </th>
             </tr>
-            <tr data-ng-show="roles && roles.length > 5">
+            <!--<tr data-ng-show="roles && roles.length > 5">
                 <th class="kc-table-actions" colspan="3">
                     <div class="search-comp clearfix">
                         <input type="text" placeholder="Search..." class="search">
@@ -41,13 +41,14 @@
                     </div>
                 </th>
             </tr>
+            -->
             <tr data-ng-hide="!roles || roles.length == 0">
                 <th>Role Name</th>
                 <th>Composite</th>
                 <th>Description</th>
             </tr>
             </thead>
-            <tfoot data-ng-show="roles && roles.length > 5"> <!-- todo -->
+            <!--<tfoot data-ng-show="roles && roles.length > 5">
             <tr>
                 <td colspan="3">
                     <div class="table-nav">
@@ -59,6 +60,7 @@
                 </td>
             </tr>
             </tfoot>
+            -->
             <tbody>
             <tr ng-repeat="role in roles">
                 <td><a href="#/realms/{{realm.realm}}/applications/{{application.name}}/roles/{{role.name}}">{{role.name}}</a></td>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-list.html
index 2ac4227146..c477f14ce6 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-list.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-list.html
@@ -14,15 +14,15 @@
             <tr>
                 <th class="kc-table-actions" colspan="3">
                     <div class="search-comp clearfix">
-                        <input type="text" placeholder="Search..." class="form-control search"
+                        <input type="text" placeholder="Search..." class="form-control search" data-ng-model="search.name"
                                onkeyup="if(event.keyCode == 13){$(this).next('button').click();}">
-                        <button class="kc-icon-search" tooltip-placement="right"
-                                tooltip="Search by oauth client name">
+                        <button type="submit" class="kc-icon-search" tooltip-placement="right"
+                                tooltip="Search by application name.">
                             Icon: search
                         </button>
                     </div>
                     <div class="pull-right">
-                        <a class="btn btn-primary" href="#/create/oauth-client/{{realm.realm}}">Add OAuth Client</a>
+                        <a class="btn btn-primary" href="#/create/application/{{realm.realm}}">Add Application</a>
                     </div>
                 </th>
             </tr>
@@ -31,7 +31,7 @@
                 <th>Enabled</th>
             </tr>
             </thead>
-            <tfoot data-ng-show="oauthClients && oauthClients.length > 5"> <!-- todo -->
+            <!--<tfoot data-ng-show="oauthClients && oauthClients.length > 5">
             <tr>
                 <td colspan="2">
                     <div class="table-nav">
@@ -43,8 +43,9 @@
                 </td>
             </tr>
             </tfoot>
+            -->
             <tbody>
-            <tr ng-repeat="client in oauthClients">
+            <tr ng-repeat="client in oauthClients | filter:search">
                 <td><a href="#/realms/{{realm.realm}}/oauth-clients/{{client.id}}">{{client.name}}</a></td>
                 <td>{{client.enabled}}</td>
             </tr>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-list.html
index e0062e0a19..e14ff72dcf 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-list.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-list.html
@@ -13,22 +13,18 @@
             <table class="table">
                 <thead>
                 <tr>
-                    <th class="kc-table-actions" colspan="3" data-ng-show="access.manageRealm">
-                        <div class="pull-right">
-                            <a class="btn btn-primary" href="#/create/role/{{realm.realm}}">Add Role</a>
-                            <!-- <button class="remove disabled">Remove</button> -->
-                        </div>
-                    </th>
-                </tr>
-                <tr data-ng-show="roles && roles.length > 5">
                     <th class="kc-table-actions" colspan="3">
                         <div class="search-comp clearfix">
-                            <input type="text" placeholder="Search..." class="search">
-                            <button class="icon-search" tooltip-placement="right"
-                                    tooltip="Search by role name.">
+                            <input type="text" placeholder="Search..." data-ng-model="searchQuery" class="form-control search">
+                            <button class="kc-icon-search" tooltip-placement="right"
+                                    tooltip="Search by name.">
                                 Icon: search
                             </button>
                         </div>
+                        <div class="pull-right" data-ng-show="access.manageRealm">
+                            <a class="btn btn-primary" href="#/create/role/{{realm.realm}}">Add Role</a>
+                            <!-- <button class="remove disabled">Remove</button> -->
+                        </div>
                     </th>
                 </tr>
                 <tr data-ng-show="roles && roles.length > 0">
@@ -37,20 +33,21 @@
                     <th>Description</th>
                 </tr>
                 </thead>
-                <tfoot data-ng-show="roles && roles.length > 5"> <!-- todo -->
+                <!--
+                <tfoot data-ng-show="roles && roles.length > 5">
                 <tr>
                     <td colspan="3">
                         <div class="table-nav">
-                            <a href="#" class="first disabled">First page</a><a href="#" class="prev disabled">Previous
-                            page</a><span><strong>1-8</strong> of <strong>10</strong></span><a href="#"
-                                                                                               class="next">Next
-                            page</a><a href="#" class="last">Last page</a>
+                            <a href="#" class="first disabled">First page</a>
+                            <a href="#" class="prev disabled">Previous page</a><span><strong>1-8</strong> of <strong>10</strong></span>
+                            <a href="#" class="next">Next page</a><a href="#" class="last">Last page</a>
                         </div>
                     </td>
                 </tr>
                 </tfoot>
+                 -->
                 <tbody>
-                <tr ng-repeat="role in roles">
+                <tr ng-repeat="role in roles | filter:{name: searchQuery}">
                     <td><a href="#/realms/{{realm.realm}}/roles/{{role.name}}">{{role.name}}</a></td>
                     <td>{{role.composite}}</td>
                     <td>{{role.description}}</td>