killbill-aplcache

diff --git a/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg b/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg
index 3f2702c..0f5bb37 100644
--- a/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg
+++ b/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg
@@ -88,10 +88,10 @@ getAccountByKey() ::= <<
 
 searchQuery(prefix) ::= <<
      <idField(prefix)> = :searchKey
-  or <prefix>.name like :likeSearchKey
-  or <prefix>.email like :likeSearchKey
-  or <prefix>.external_key like :likeSearchKey
-  or <prefix>.company_name like :likeSearchKey
+  or <prefix>name like :likeSearchKey
+  or <prefix>email like :likeSearchKey
+  or <prefix>external_key like :likeSearchKey
+  or <prefix>company_name like :likeSearchKey
 >>
 
 getIdFromKey() ::= <<

diff --git a/subscription/src/main/resources/com/ning/billing/subscription/engine/dao/BundleSqlDao.sql.stg b/subscription/src/main/resources/com/ning/billing/subscription/engine/dao/BundleSqlDao.sql.stg
index bc883f6..c85a7f0 100644
--- a/subscription/src/main/resources/com/ning/billing/subscription/engine/dao/BundleSqlDao.sql.stg
+++ b/subscription/src/main/resources/com/ning/billing/subscription/engine/dao/BundleSqlDao.sql.stg
@@ -80,6 +80,6 @@ account_id = :accountId
 
 searchQuery(prefix) ::= <<
      <idField(prefix)> = :searchKey
-  or <prefix>.external_key = :searchKey
-  or <prefix>.account_id = :searchKey
+  or <prefix>external_key = :searchKey
+  or <prefix>account_id = :searchKey
 >>

diff --git a/util/src/main/resources/com/ning/billing/util/customfield/dao/CustomFieldSqlDao.sql.stg b/util/src/main/resources/com/ning/billing/util/customfield/dao/CustomFieldSqlDao.sql.stg
index fcdf9f5..8bc1d99 100644
--- a/util/src/main/resources/com/ning/billing/util/customfield/dao/CustomFieldSqlDao.sql.stg
+++ b/util/src/main/resources/com/ning/billing/util/customfield/dao/CustomFieldSqlDao.sql.stg
@@ -54,7 +54,7 @@ and is_active
 
 searchQuery(prefix) ::= <<
      <idField(prefix)> = :searchKey
-  or <prefix>.object_type like :likeSearchKey
-  or <prefix>.field_name like :likeSearchKey
-  or <prefix>.field_value like :likeSearchKey
+  or <prefix>object_type like :likeSearchKey
+  or <prefix>field_name like :likeSearchKey
+  or <prefix>field_value like :likeSearchKey
 >>

diff --git a/util/src/main/resources/com/ning/billing/util/entity/dao/EntitySqlDao.sql.stg b/util/src/main/resources/com/ning/billing/util/entity/dao/EntitySqlDao.sql.stg
index b878e40..85031cd 100644
--- a/util/src/main/resources/com/ning/billing/util/entity/dao/EntitySqlDao.sql.stg
+++ b/util/src/main/resources/com/ning/billing/util/entity/dao/EntitySqlDao.sql.stg
@@ -267,7 +267,7 @@ search() ::= <<
 select
 <allTableFields("t.")>
 from <tableName()> t
-where <searchQuery("t.")>
+where (<searchQuery("t.")>)
 <AND_CHECK_TENANT("t.")>
 order by <recordIdField("t.")> ASC
 limit :offset, :rowCount
@@ -278,7 +278,7 @@ getSearchCount() ::= <<
 select
   count(1) as count
 from <tableName()> t
-where <searchQuery("t.")>
+where (<searchQuery("t.")>)
 <AND_CHECK_TENANT("t.")>
 ;
 >>