improved automatic routing to retain url yet still redirect from /data and /analytics