Index: kernel-impl/src/main/java/org/sakaiproject/alias/impl/DbAliasService.java
===================================================================
--- kernel-impl/src/main/java/org/sakaiproject/alias/impl/DbAliasService.java	(revision 65058)
+++ kernel-impl/src/main/java/org/sakaiproject/alias/impl/DbAliasService.java	(working copy)
@@ -466,9 +466,9 @@
 			}
 
 			Object[] fields = new Object[2];
-			fields[0] = "%" + criteria + "%";
+			fields[0] = "%" + criteria.toUpperCase() + "%";
 			fields[1] = fields[0];
-			List all = super.getSelectedResources("UPPER(ALIAS_ID) LIKE UPPER(?) OR UPPER(TARGET) LIKE UPPER(?)", fields, first,
+			List all = super.getSelectedResources("UPPER(ALIAS_ID) LIKE ? OR UPPER(TARGET) LIKE ?", fields, first,
 					last);
 
 			return all;
@@ -496,9 +496,9 @@
 			}
 
 			Object[] fields = new Object[2];
-			fields[0] = "%" + criteria + "%";
+			fields[0] = "%" + criteria.toUpperCase() + "%";
 			fields[1] = fields[0];
-			int rv = super.countSelectedResources("UPPER(ALIAS_ID) LIKE UPPER(?) OR UPPER(TARGET) LIKE UPPER(?)", fields);
+			int rv = super.countSelectedResources("UPPER(ALIAS_ID) LIKE ? OR UPPER(TARGET) LIKE ?", fields);
 
 			return rv;
 		}
Index: kernel-impl/src/main/java/org/sakaiproject/authz/impl/DbAuthzGroupService.java
===================================================================
--- kernel-impl/src/main/java/org/sakaiproject/authz/impl/DbAuthzGroupService.java	(revision 65058)
+++ kernel-impl/src/main/java/org/sakaiproject/authz/impl/DbAuthzGroupService.java	(working copy)
@@ -591,10 +591,10 @@
 			if (criteria != null)
 			{
 				criteria = "%" + criteria + "%";
-				String where = "( UPPER(REALM_ID) like UPPER(?) or UPPER(PROVIDER_ID) like UPPER(?) )";
+				String where = "( UPPER(REALM_ID) like ? or UPPER(PROVIDER_ID) like ? )";
 				Object[] fields = new Object[2];
-				fields[0] = criteria;
-				fields[1] = criteria;
+				fields[0] = criteria.toUpperCase();
+				fields[1] = criteria.toUpperCase();
 
 				// paging
 				if (page != null)
@@ -659,10 +659,10 @@
 			if (criteria != null)
 			{
 				criteria = "%" + criteria + "%";
-				String where = "( UPPER(REALM_ID) like UPPER(?) or UPPER(PROVIDER_ID) like UPPER(?) )";
+				String where = "( UPPER(REALM_ID) like ? or UPPER(PROVIDER_ID) like ? )";
 				Object[] fields = new Object[2];
-				fields[0] = criteria;
-				fields[1] = criteria;
+				fields[0] = criteria.toUpperCase();
+				fields[1] = criteria.toUpperCase();
 
 				rv = countSelectedResources(where, fields);
 			}
Index: kernel-impl/src/main/java/org/sakaiproject/site/impl/SiteServiceSqlDb2.java
===================================================================
--- kernel-impl/src/main/java/org/sakaiproject/site/impl/SiteServiceSqlDb2.java	(revision 65058)
+++ kernel-impl/src/main/java/org/sakaiproject/site/impl/SiteServiceSqlDb2.java	(working copy)
@@ -1,8 +1,8 @@
-/**********************************************************************************
- * $URL: https://source.sakaiproject.org/contrib/rsmart/dbrefactor/site/site-impl/impl/src/java/org/sakaiproject/site/impl/SiteServiceSqlDb2.java $
- * $Id: SiteServiceSqlDb2.java 3560 2007-02-19 22:08:01Z jbush@rsmart.com $
- ***********************************************************************************
- *
+/**********************************************************************************
+ * $URL: https://source.sakaiproject.org/contrib/rsmart/dbrefactor/site/site-impl/impl/src/java/org/sakaiproject/site/impl/SiteServiceSqlDb2.java $
+ * $Id: SiteServiceSqlDb2.java 3560 2007-02-19 22:08:01Z jbush@rsmart.com $
+ ***********************************************************************************
+ *
  * Copyright (c) 2007, 2008 Sakai Foundation
  *
  * Licensed under the Educational Community License, Version 2.0 (the "License");
@@ -16,14 +16,28 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- **********************************************************************************/
-
-package org.sakaiproject.site.impl;
-
-/**
- * methods for accessing site data in a db2 database.
- */
-public class SiteServiceSqlDb2 extends SiteServiceSqlDefault
-{
-}
+ *
+ **********************************************************************************/
+
+package org.sakaiproject.site.impl;
+
+/**
+ * methods for accessing site data in a db2 database.
+ */
+public class SiteServiceSqlDb2 extends SiteServiceSqlDefault
+{
+     /**
+      * returns the sql statement which is part of the where clause to retrieve sites.
+      */
+     public String getSitesWhere9Sql()
+     {
+         return "UPPER(SAKAI_SITE.TITLE) like UPPER(?||'') and ";
+     }
+     /**
+      * returns the sql statement which is part of the where clause to retrieve sites.
+      */
+     public String getSitesWhere13Sql()
+     {
+         return "SAKAI_SITE.SITE_ID in (select SITE_ID from SAKAI_SITE_PROPERTY where NAME = ? and UPPER(VALUE) like UPPER(?||'')) and ";
+     }
+}
Index: kernel-impl/src/main/java/org/sakaiproject/user/impl/UserServiceSqlDb2.java
===================================================================
--- kernel-impl/src/main/java/org/sakaiproject/user/impl/UserServiceSqlDb2.java	(revision 65058)
+++ kernel-impl/src/main/java/org/sakaiproject/user/impl/UserServiceSqlDb2.java	(working copy)
@@ -1,8 +1,8 @@
-/**********************************************************************************
- * $URL: https://source.sakaiproject.org/contrib/rsmart/dbrefactor/user/user-impl/impl/src/java/org/sakaiproject/user/impl/UserServiceSqlDb2.java $
- * $Id: UserServiceSqlDb2.java 3560 2007-02-19 22:08:01Z jbush@rsmart.com $
- ***********************************************************************************
- *
+/**********************************************************************************
+ * $URL: https://source.sakaiproject.org/contrib/rsmart/dbrefactor/user/user-impl/impl/src/java/org/sakaiproject/user/impl/UserServiceSqlDb2.java $
+ * $Id: UserServiceSqlDb2.java 3560 2007-02-19 22:08:01Z jbush@rsmart.com $
+ ***********************************************************************************
+ *
  * Copyright (c) 2007, 2008 Sakai Foundation
  *
  * Licensed under the Educational Community License, Version 2.0 (the "License");
@@ -16,14 +16,20 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- **********************************************************************************/
-
-package org.sakaiproject.user.impl;
-
-/**
- * methods for accessing user data in a db2 database.
- */
-public class UserServiceSqlDb2 extends UserServiceSqlDefault
-{
-}
+ *
+ **********************************************************************************/
+
+package org.sakaiproject.user.impl;
+
+/**
+ * methods for accessing user data in a db2 database.
+ */
+public class UserServiceSqlDb2 extends UserServiceSqlDefault
+{
+     public String getUserWhereSql()
+     {
+         return "SAKAI_USER.USER_ID = SAKAI_USER_ID_MAP.USER_ID AND (SAKAI_USER.USER_ID = ? OR UPPER(EID) LIKE UPPER(?||'') OR EMAIL_LC LIKE ? OR UPPER(FIR
+ST_NAME) LIKE UPPER(?||'') OR UPPER(LAST_NAME) LIKE UPPER(?||''))";
+     }
+ 
+}