Strip query string option

Includes the previous PR