Index: UnicodeNormalizationFilter.java
===================================================================
--- UnicodeNormalizationFilter.java	(revision 32597)
+++ UnicodeNormalizationFilter.java	(working copy)
@@ -78,9 +78,9 @@
 
         // set new values for original uri and url
         MgnlContext.getAggregationState().setOriginalURI(
-            UnicodeNormalizer.normalizeNFC(MgnlContext.getAggregationState().getOriginalURI()));
+            UnicodeNormalizer.normalizeNFC(MgnlContext.getAggregationState().getOriginalBrowserURI()));
         MgnlContext.getAggregationState().setOriginalURL(
-            UnicodeNormalizer.normalizeNFC(MgnlContext.getAggregationState().getOriginalURL()));
+            UnicodeNormalizer.normalizeNFC(MgnlContext.getAggregationState().getOriginalBrowserURL()));
 
         // check if it is not a multipart form
         if (MgnlContext.getPostedForm() == null)