#1473 making sure "q" doesn't appear twice in the URL