diff --git a/CHANGELOG.md b/CHANGELOG.md
index b469972e..c781a083 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.8
+
+- fix: Wrong parameters use
+
 ## 0.1.7
 
 - change: Less noisy one-line logs
diff --git a/lib/src/matrix_api.dart b/lib/src/matrix_api.dart
index bfe13ca7..91e11475 100644
--- a/lib/src/matrix_api.dart
+++ b/lib/src/matrix_api.dart
@@ -2038,7 +2038,8 @@ class MatrixApi {
       String sessionId, String version, RoomKeysSingleKey session) async {
     final ret = await request(
       RequestType.PUT,
-      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}?version=${Uri.encodeComponent(version)}',
+      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}',
+      query: {'version': version},
       data: session.toJson(),
     );
     return RoomKeysUpdateResponse.fromJson(ret);
@@ -2050,7 +2051,8 @@ class MatrixApi {
       String roomId, String sessionId, String version) async {
     final ret = await request(
       RequestType.GET,
-      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}?version=${Uri.encodeComponent(version)}',
+      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}',
+      query: {'version': version},
     );
     return RoomKeysSingleKey.fromJson(ret);
   }
@@ -2061,7 +2063,8 @@ class MatrixApi {
       String roomId, String sessionId, String version) async {
     final ret = await request(
       RequestType.DELETE,
-      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}?version=${Uri.encodeComponent(version)}',
+      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}',
+      query: {'version': version},
     );
     return RoomKeysUpdateResponse.fromJson(ret);
   }
@@ -2072,7 +2075,8 @@ class MatrixApi {
       String roomId, String version, RoomKeysRoom keys) async {
     final ret = await request(
       RequestType.PUT,
-      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}?version=${Uri.encodeComponent(version)}',
+      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}',
+      query: {'version': version},
       data: keys.toJson(),
     );
     return RoomKeysUpdateResponse.fromJson(ret);
@@ -2083,7 +2087,8 @@ class MatrixApi {
   Future<RoomKeysRoom> getRoomKeysRoom(String roomId, String version) async {
     final ret = await request(
       RequestType.GET,
-      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}?version=${Uri.encodeComponent(version)}',
+      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}',
+      query: {'version': version},
     );
     return RoomKeysRoom.fromJson(ret);
   }
@@ -2094,7 +2099,8 @@ class MatrixApi {
       String roomId, String version) async {
     final ret = await request(
       RequestType.DELETE,
-      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}?version=${Uri.encodeComponent(version)}',
+      '/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}',
+      query: {'version': version},
     );
     return RoomKeysUpdateResponse.fromJson(ret);
   }
@@ -2105,7 +2111,8 @@ class MatrixApi {
       String version, RoomKeys keys) async {
     final ret = await request(
       RequestType.PUT,
-      '/client/unstable/room_keys/keys?version=${Uri.encodeComponent(version)}',
+      '/client/unstable/room_keys/keys',
+      query: {'version': version},
       data: keys.toJson(),
     );
     return RoomKeysUpdateResponse.fromJson(ret);
@@ -2116,7 +2123,8 @@ class MatrixApi {
   Future<RoomKeys> getRoomKeys(String version) async {
     final ret = await request(
       RequestType.GET,
-      '/client/unstable/room_keys/keys?version=${Uri.encodeComponent(version)}',
+      '/client/unstable/room_keys/keys',
+      query: {'version': version},
     );
     return RoomKeys.fromJson(ret);
   }
@@ -2126,7 +2134,8 @@ class MatrixApi {
   Future<RoomKeysUpdateResponse> deleteRoomKeys(String version) async {
     final ret = await request(
       RequestType.DELETE,
-      '/client/unstable/room_keys/keys?version=${Uri.encodeComponent(version)}',
+      '/client/unstable/room_keys/keys',
+      query: {'version': version},
     );
     return RoomKeysUpdateResponse.fromJson(ret);
   }
diff --git a/lib/src/model/filter.dart b/lib/src/model/filter.dart
index 5b009fcd..7103ec1e 100644
--- a/lib/src/model/filter.dart
+++ b/lib/src/model/filter.dart
@@ -214,13 +214,13 @@ class StateFilter extends EventFilter {
       data['not_types'] = notTypes;
     }
     if (lazyLoadMembers != null) {
-      data['lazy_load_members'] = notTypes;
+      data['lazy_load_members'] = lazyLoadMembers;
     }
     if (includeRedundantMembers != null) {
-      data['include_redundant_members'] = notTypes;
+      data['include_redundant_members'] = includeRedundantMembers;
     }
     if (containsUrl != null) {
-      data['contains_url'] = notTypes;
+      data['contains_url'] = containsUrl;
     }
     return data;
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 9d2cee96..94f1ee46 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: matrix_api_lite
 description: Dead simple data model for the matrix.org client-server API.
-version: 0.1.7
+version: 0.1.8
 homepage: https://famedly.com
 
 environment:
diff --git a/test/matrix_api_test.dart b/test/matrix_api_test.dart
index ecdff689..be00af9f 100644
--- a/test/matrix_api_test.dart
+++ b/test/matrix_api_test.dart
@@ -134,12 +134,14 @@ void main() {
       final wellKnownInformations =
           await matrixApi.requestWellKnownInformations();
       expect(wellKnownInformations.mHomeserver.baseUrl,
-          'https://matrix.example.com');
+          'https://fakeserver.notexisting');
       expect(wellKnownInformations.toJson(), {
-        'm.homeserver': {'base_url': 'https://matrix.example.com'},
-        'm.identity_server': {'base_url': 'https://identity.example.com'},
+        'm.homeserver': {'base_url': 'https://fakeserver.notexisting'},
+        'm.identity_server': {
+          'base_url': 'https://identity.fakeserver.notexisting'
+        },
         'org.example.custom.property': {
-          'app_url': 'https://custom.app.example.org'
+          'app_url': 'https://custom.app.fakeserver.notexisting'
         }
       });
     });
@@ -414,9 +416,9 @@ void main() {
             'not_rooms': ['!1234'],
             'not_senders': ['@bob:example.com'],
             'not_types': ['type2'],
-            'lazy_load_members': ['type2'],
-            'include_redundant_members': ['type2'],
-            'contains_url': ['type2']
+            'lazy_load_members': true,
+            'include_redundant_members': false,
+            'contains_url': true,
           },
           'account_data': {
             'limit': 10,