More fixing for new directory - URL generated is not correct however.