diff --git a/templates/index.html b/templates/index.html
index 17d0609..9c5d7b9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -268,18 +268,22 @@
                             </div>
                         </div>
                         <div class="card-text">
-                            ${createFieldIfValue('Nummer', customer.nummer, createCustomerLink)}
+                            ${createFieldIfValue('Nummer', highlightText(customer.nummer, generalSearchTerm), createCustomerLink)}
                             ${createFieldIfValue('Adresse', (customer.strasse && customer.plz && customer.ort) ? true : false, 
-                                () => createAddressLink(customer.strasse, customer.plz, customer.ort))}
-                            ${createFieldIfValue('Telefon', customer.telefon, createPhoneLink)}
-                            ${createFieldIfValue('Mobil', customer.mobil, createPhoneLink)}
-                            ${createFieldIfValue('Handy', customer.handy, createPhoneLink)}
-                            ${createFieldIfValue('Telefon Firma', customer.tele_firma, createPhoneLink)}
-                            ${createFieldIfValue('E-Mail', customer.email, createEmailLink)}
+                                () => createAddressLink(
+                                    highlightText(customer.strasse, generalSearchTerm), 
+                                    highlightText(customer.plz, generalSearchTerm), 
+                                    highlightText(customer.ort, generalSearchTerm)
+                                ))}
+                            ${createFieldIfValue('Telefon', highlightText(customer.telefon, generalSearchTerm), createPhoneLink)}
+                            ${createFieldIfValue('Mobil', highlightText(customer.mobil, generalSearchTerm), createPhoneLink)}
+                            ${createFieldIfValue('Handy', highlightText(customer.handy, generalSearchTerm), createPhoneLink)}
+                            ${createFieldIfValue('Telefon Firma', highlightText(customer.tele_firma, generalSearchTerm), createPhoneLink)}
+                            ${createFieldIfValue('E-Mail', highlightText(customer.email, generalSearchTerm), createEmailLink)}
                             ${createFieldIfValue('Fachrichtung', highlightText(customer.fachrichtung, generalSearchTerm || fachrichtungSearchTerm))}
-                            ${createFieldIfValue('Kontakt 1', customer.kontakt1, createPhoneLink)}
-                            ${createFieldIfValue('Kontakt 2', customer.kontakt2, createPhoneLink)}
-                            ${createFieldIfValue('Kontakt 3', customer.kontakt3, createPhoneLink)}
+                            ${createFieldIfValue('Kontakt 1', highlightText(customer.kontakt1, generalSearchTerm), createPhoneLink)}
+                            ${createFieldIfValue('Kontakt 2', highlightText(customer.kontakt2, generalSearchTerm), createPhoneLink)}
+                            ${createFieldIfValue('Kontakt 3', highlightText(customer.kontakt3, generalSearchTerm), createPhoneLink)}
                             ${customer.tags && customer.tags.length > 0 ? `
                                 <p class="mb-0"><strong>Tags:</strong> 
                                     ${customer.tags.map(tag => `<span class="badge bg-primary me-1">${tag}</span>`).join('')}