diff --git a/www/index.php b/www/index.php
index 1b70b3486211358be918a37cd7533a7484c8f2c6..cdab45dbf8fb1c82bb5b00ffb7008540b23256c3 100644
--- a/www/index.php
+++ b/www/index.php
@@ -76,17 +76,23 @@ if (isset($_GET['u']) && $scanned = UNL_Search::getScannedPage($_GET['u'])) {
             $purifier = new HTMLPurifier($config);
     
             $page->head        .= '<link rel="home" href="'.htmlentities($_GET['u'], ENT_QUOTES).'" />';
-            $page->breadcrumbs  = $purifier->purify(UNL_Search::removeRelativePaths($scanned->breadcrumbs, $_GET['u']));
-            $page->titlegraphic = $purifier->purify(str_replace(array('<h1>', '</h1>'), '',$scanned->titlegraphic));
-            $page->navlinks     = $purifier->purify(UNL_Search::removeRelativePaths($scanned->navlinks, $_GET['u']));
-            if (!empty($scanned->leftcollinks)) {
-                $page->leftcollinks = $purifier->purify($scanned->leftcollinks);
-            }
-            if (!empty($scanned->contactinfo)) {
-                $page->contactinfo = $purifier->purify(preg_replace('#<h3>.*</h3>#', '', $scanned->contactinfo));
-            }
-            if (!empty($scanned->footercontent)) {
-                $page->footercontent = $purifier->purify($scanned->footercontent);
+            $page->titlegraphic = $purifier->purify(str_replace(array('<h1>', '</h1>'), '', $scanned->titlegraphic));
+            
+            foreach (array('breadcrumbs', 'navlinks', 'leftcollinks', 'contactinfo', 'footercontent') as $region) {
+                if (isset($scanned->{$region}) && !empty($scanned->{$region})) {
+                    $scannedContent = $scanned->{$region};
+                    switch ($region) {
+                        case 'breadcrumbs':
+                        case 'navlinks':
+                            $scannedContent = UNL_Search::removeRelativePaths($scannedContent, $_GET['u']);
+                            break;
+                        case 'contactinfo':
+                            $scannedContent = preg_replace('#<h3>.*</h3>#', '', $scannedContent);
+                            break;
+                    }
+                    
+                    $page->{$region} = $purifier->purify($scannedContent);
+                }
             }
         } else {
             loadDefaultSections($page);