LocaleRequestWrapper.java fixed, RewriteQueryTag.java regex simplified