diff --git a/src/app/core/table/table.html b/src/app/core/table/table.html
index b8fe9f4..b7aaa96 100644
--- a/src/app/core/table/table.html
+++ b/src/app/core/table/table.html
@@ -14,8 +14,6 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
-
 <div ng-show="vm.data.length > 0 && vm.loader == false">
     <div class="row" ng-if="vm.config.filter == 'fulltext'">
         <div class="col-xs-12">
@@ -66,7 +64,7 @@
             </tr>
         </tbody>
         <tbody>
-        <tr ng-repeat="item in vm.data | filter:vm.query | orderBy:vm.orderBy:vm.reverse | pagination:vm.currentPage * vm.config.pagination.pageSize | limitTo: (vm.config.pagination.pageSize || vm.data.length) track by $index">
+        <tr ng-class="{active: vm.config.selectedRow == $index}" ng-repeat="item in (vm.config.filteredData = (vm.data | filter:vm.query | orderBy:vm.orderBy:vm.reverse | pagination:vm.currentPage * vm.config.pagination.pageSize | limitTo: (vm.config.pagination.pageSize || vm.data.length))) track by $index">
             <td ng-repeat="col in vm.config.columns" xos-link-wrapper>
                 <span ng-if="!col.type || col.type === 'text'">{{item[col.prop]}}</span>
                 <span ng-if="col.type === 'boolean'">
diff --git a/src/app/core/table/table.scss b/src/app/core/table/table.scss
index 1189a9f..b20895b 100644
--- a/src/app/core/table/table.scss
+++ b/src/app/core/table/table.scss
@@ -56,5 +56,4 @@
       margin-left: $padding-base-horizontal;
     }
   }
-
 }
\ No newline at end of file
diff --git a/src/app/core/table/table.ts b/src/app/core/table/table.ts
index 46a5ca5..6c8d95c 100644
--- a/src/app/core/table/table.ts
+++ b/src/app/core/table/table.ts
@@ -52,6 +52,8 @@
   };
   order?: IXosTableCgfOrder;
   filter?: string;
+  selectedRow?: number;
+  filteredData?: any[];
   actions?: any[]; // TODO create interface
 }
 
@@ -145,8 +147,6 @@
       this.currentPage = 0;
     }
 
-    // this.columns = this.config.columns;
-
   }
 
   public goToPage = (n) => {