Maintain Primo URL/params better (ref #7654)