Maintain Primo URL/params better (ref #7654)

Also updates MWDL parameters to what @rudeamy requested in #7654.