Updated to use RemoveQueryString helper.