diff --git a/src/lib/data-source.mjs b/src/lib/data-source.mjs
index d6bf5e1..731b303 100644
--- a/src/lib/data-source.mjs
+++ b/src/lib/data-source.mjs
@@ -27,7 +27,7 @@ export async function createIndex(client, index) {
           [doctype]: {
             properties: {
               operator: { type: 'keyword' },
-              aircraft: { type: 'text' },
+              aircraft: { type: 'text', fields: { raw: { type: 'keyword' } } },
               aircraft_manufacturer: { type: 'keyword' },
               transponder: { type: 'keyword' },
               callsign: { type: 'keyword' },
@@ -45,8 +45,8 @@ export async function createIndex(client, index) {
               squawk: { type: 'keyword' },
               spi: { type: 'boolean' },
               position_source: { type: 'keyword' },
-              from: { type: 'text' },
-              to: { type: 'text' },
+              from: { type: 'text', fields: { raw: { type: 'keyword' } } },
+              to: { type: 'text', fields: { raw: { type: 'keyword' } } },
             },
           },
         },