diff --git a/src/services/pis.services.js b/src/services/pis.services.js
index 3ee34fe..d7f6891 100644
--- a/src/services/pis.services.js
+++ b/src/services/pis.services.js
@@ -8,7 +8,9 @@ async function findPisByOrigDest(start,end) {
     log.out(`pisServices.findPisByOrigDest: Searching for PIS for Orig: ${start}, Dest: ${end}`, "dbug")
     const firstCrs = clean.cleanApiEndpointTxt(start.toLowerCase())
     const lastCrs = clean.cleanApiEndpointTxt(end.toLowerCase())
-    const search = db.query("pis", {$and:[{$expr:{$eq:[{$first:"$stops"},firstCrs]}},{$expr:{$eq:[{$last:"$stops"},lastCrs]}}]})
+    const query = {stops: {$elemMatch: {$eq: firstCrs, $position: 0}}, stops: {$elemMatch: {$eq: lastCrs, $position: {$exists: false}}}}
+    const oldQuery = {$and:[{$expr:{$eq:[{$first:"$stops"},firstCrs]}},{$expr:{$eq:[{$last:"$stops"},lastCrs]}}]}
+    const search = db.query("pis", query)
     return search
 }