upgrade for new Dart SDK: Uri.queryParameters becomes unmodifiable