More URL reformats, need to troubleshoot them.