fixes #466 part 1

preserve query strings