Better handling of removing extra query params