Should not use original forwarder URI for everything

* In the filter should use the forwarder URI only for the directory
redirect.
* Inside the includes should use the URI from the previous convention
filter forward.