diff --git a/SOPE/GDLContentStore/EOQualifier+GCS.m b/SOPE/GDLContentStore/EOQualifier+GCS.m
index 7c3593058..b8df73c3b 100644
--- a/SOPE/GDLContentStore/EOQualifier+GCS.m
+++ b/SOPE/GDLContentStore/EOQualifier+GCS.m
@@ -136,7 +136,7 @@
         {
           if (_adaptor)
             {
-              // Assume qualifier applies to a varchar column type
+              // The value is a string, assume qualifier applies to a varchar column type
               attribute = [EOAttribute new];
               [attribute setExternalType: @"varchar"];
               [attribute autorelease];
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index b40eb7cd3..0669720c6 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -221,9 +221,9 @@ static NSArray *folderListingFields = nil;
   qualifier = nil;
   if ([filter length] > 0)
     {
-      filter = [filter asSafeSQLLikeString];
+      filter = [[filter asSafeSQLString] stringByReplacingString: @"\%" withString: @"%%"];
       filters = [NSMutableArray array];
-      filterFormat = [NSString stringWithFormat: @"(%%@ isCaseInsensitiveLike: '%%%%%@%%%%')", filter];
+      filterFormat = [NSString stringWithFormat: @"(%%@ isCaseInsensitiveLike: '*%@*')", filter];
       if (criteria)
         criteriaList = [criteria objectEnumerator];
       else