Bit of work keeping URL arguments where possible