--- include/functions_url.inc.php.orig	2014-09-27 00:11:00.709339063 +0200
+++ include/functions_url.inc.php	2014-09-27 00:26:29.485342334 +0200
@@ -121,11 +121,16 @@
 function make_index_url($params = array())
 {
   global $conf;
-  $url = get_root_url().'index';
+  $url = get_root_url();
+  //JFL
+  if(!array_key_exists('category', $params) or
+        !array_key_exists('permalink', $params['category'])) {
+    $url .= 'index';
   if ($conf['php_extension_in_urls'])
   {
     $url .= '.php';
   }
+  }
   if ($conf['question_mark_in_urls'])
   {
     $url .= '?';
@@ -351,9 +356,10 @@
             'make_section_in_url category permalink not set', E_USER_WARNING
             );
 
-        $section_string.= '/category/';
+	//JFL
         if ( empty($params['category']['permalink']) )
         {
+          $section_string.= '/category/';
           $section_string.= $params['category']['id'];
           if ( $conf['category_url_style']=='id-name' )
           {
@@ -362,6 +368,7 @@
         }
         else
         {
+          $section_string.= '/';
           $section_string.= $params['category']['permalink'];
         }
       }