diff --git a/client/core/src/popover/popover.js b/client/core/src/popover/popover.js
index 7354dccb5..a1cac7112 100644
--- a/client/core/src/popover/popover.js
+++ b/client/core/src/popover/popover.js
@@ -158,7 +158,7 @@ export class Popover {
     }
     _findPopOver(node) {
         while (node != null) {
-            if (node.id && node.id.indexOf('popover-') !== -1) {
+            if (node.id && node.id.startsWith('popover-')) {
                 return node.id;
             }
             node = node.parentNode;
diff --git a/client/production/src/production-filters/production-filters.html b/client/production/src/production-filters/production-filters.html
index 0532cd73a..037d6c885 100644
--- a/client/production/src/production-filters/production-filters.html
+++ b/client/production/src/production-filters/production-filters.html
@@ -1,6 +1,6 @@
 <form ng-submit="$ctrl.onSubmit($ctrl.filter)" pad-large>
     <vn-horizontal>
-        <vn-textfield vn-one label="Route ID" model="$ctrl.filter.ruteId"></vn-textfield>
+        <vn-textfield vn-one label="Route ID" model="$ctrl.filter.routeFk"></vn-textfield>
         <vn-date-picker vn-one label="Date" model="$ctrl.filter.date"></vn-date-picker>
     </vn-horizontal>
     <vn-horizontal>
diff --git a/client/production/src/production-table/production-table.html b/client/production/src/production-table/production-table.html
index 4b8539839..d559bb16c 100644
--- a/client/production/src/production-table/production-table.html
+++ b/client/production/src/production-table/production-table.html
@@ -6,7 +6,7 @@
         </vn-colum-header>
         <vn-colum-header vn-one pad-medium-h field="ticketFk" text="Ticket ID"></vn-colum-header>
         <vn-colum-header vn-two pad-medium-h field="agency" text="Agency"></vn-colum-header>
-        <vn-colum-header vn-one pad-medium-h field="id" text="Route ID"></vn-colum-header>
+        <vn-colum-header vn-one pad-medium-h field="routeFk" text="Route ID"></vn-colum-header>
         <vn-colum-header vn-two pad-medium-h field="salesPerson" text="Commercial"></vn-colum-header>
         <vn-colum-header vn-one pad-medium-h field="hour" text="Hour"></vn-colum-header>
         <vn-colum-header vn-one pad-medium-h field="state" text="State"></vn-colum-header>
@@ -25,7 +25,7 @@
             </vn-none>
             <vn-one pad-medium-h>{{::ticket.ticketFk}}</vn-one>
             <vn-two pad-medium-h>{{::ticket.agency}}</vn-two>
-            <vn-one pad-medium-h>{{::ticket.id}}</vn-one>
+            <vn-one pad-medium-h>{{::ticket.routeFk}}</vn-one>
             <vn-two pad-medium-h>{{::ticket.salesPerson | ucwords}}</vn-two>
             <vn-one pad-medium-h>{{ticket.hour}}</vn-one>
             <vn-one pad-medium-h>{{ticket.state}}</vn-one>