For #1613
Also changed up how base URL setting was being done by manipulating incoming request URLs instead of altering then on generation.