diff --git a/starter.sh b/starter.sh
index 710b3f84b..e09a30707 100644
--- a/starter.sh
+++ b/starter.sh
@@ -214,8 +214,8 @@ else
         code="${code}response = ${module}A.${element}.compareTo(${module}B.${element});${lineBreak}break;${lineBreak}"
         sed -i -e "s/$comment/$comment${lineBreak}$code/g" "./lib/data/models/${module}_model.dart"
 
-        comment="STARTER: search - do not remove comment"
-        code="if (${element}.toLowerCase().contains(search)){${lineBreak}"
+        comment="STARTER: filter - do not remove comment"
+        code="if (${element}.toLowerCase().contains(filter)){${lineBreak}"
         code="${code}return true;${lineBreak}"
         code="${code}}${lineBreak}"
         sed -i -e "s/$comment/$comment${lineBreak}$code/g" "./lib/data/models/${module}_model.dart"
diff --git a/stubs/data/models/stub_model b/stubs/data/models/stub_model
index 6055c5331..d8fa9ffa2 100644
--- a/stubs/data/models/stub_model
+++ b/stubs/data/models/stub_model
@@ -4,6 +4,7 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
 
 part 'stub_model.g.dart';
 
+
 abstract class StubListResponse
     implements Built<StubListResponse, StubListResponseBuilder> {
   factory StubListResponse([void updates(StubListResponseBuilder b)]) =
@@ -14,7 +15,7 @@ abstract class StubListResponse
   BuiltList<StubEntity> get data;
 
   static Serializer<StubListResponse> get serializer =>
-      _$StubListResponseSerializer;
+      _$stubListResponseSerializer;
 }
 
 abstract class StubItemResponse
@@ -27,16 +28,17 @@ abstract class StubItemResponse
   StubEntity get data;
 
   static Serializer<StubItemResponse> get serializer =>
-      _$StubItemResponseSerializer;
+      _$stubItemResponseSerializer;
 }
 
-
 class StubFields {
   // STARTER: fields - do not remove comment
 }
 
 abstract class StubEntity extends Object with BaseEntity implements Built<StubEntity, StubEntityBuilder> {
 
+  // STARTER: properties - do not remove comment
+
   static int counter = 0;
   factory StubEntity() {
     return _$StubEntity._(
@@ -45,8 +47,6 @@ abstract class StubEntity extends Object with BaseEntity implements Built<StubEn
     );
   }
 
-  // STARTER: properties - do not remove comment
-
   String get displayName {
     // STARTER: display name - do not remove comment
   }
@@ -67,30 +67,18 @@ abstract class StubEntity extends Object with BaseEntity implements Built<StubEn
     }
   }
 
-  @override
-  bool matchesFilter(String filter) {
+  bool matchesSearch(String filter) {
     if (filter == null || filter.isEmpty) {
       return true;
     }
 
     filter = filter.toLowerCase();
 
-    // STARTER: search - do not remove comment
+    // STARTER: filter - do not remove comment
 
     return false;
   }
 
-  @override
-  String matchesFilterValue(String filter) {
-    if (filter == null || filter.isEmpty) {
-      return null;
-    }
-
-    filter = filter.toLowerCase();
-
-    return null;
-  }
-
   StubEntity._();
   static Serializer<StubEntity> get serializer => _$stubEntitySerializer;
 }