Added a filter that can handle 2 url pattern
Fixed issue about server internationalization support