No longer trimming end of URL after ? character.