diff --git a/iwla.py b/iwla.py
index 8cfd6ed..609108d 100755
--- a/iwla.py
+++ b/iwla.py
@@ -142,7 +142,7 @@ class IWLA(object):
         self.log_format_extracted = re.sub(r'\$(\w+)', '(?P<\g<1>>.+)', self.log_format_extracted)
         self.http_request_extracted = re.compile(r'(?P<http_method>\S+) (?P<http_uri>\S+) (?P<http_version>\S+)')
         self.log_re = re.compile(self.log_format_extracted)
-        self.uri_re = re.compile(r'(?P<extract_uri>[^\?]+)(\?(?P<extract_parameters>.+))?')
+        self.uri_re = re.compile(r'(?P<extract_uri>[^\?#]+)(\?(?P<extract_parameters>[^#]+))?(#.*)?')
         self.domain_name_re = re.compile(r'.*%s' % conf.domain_name)
         self.plugins = [(conf.PRE_HOOK_DIRECTORY     , conf.pre_analysis_hooks),
                         (conf.POST_HOOK_DIRECTORY    , conf.post_analysis_hooks),
@@ -456,6 +456,7 @@ class IWLA(object):
         total[0] = self._('Total')
         total[5] = bytesToStr(total[5])
         total[6] = bytesToStr(total[6])
+        total[7] = u''
         months.appendRow(total)
         page.appendBlock(months)