Router change to not discard query string