#1509 - Fixed URL rewriting errors

Signed-off-by: Carlos Escribano Rey <carlos@markhaus.com>