Remove code that skips ?'s in URL