diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_getDocumentValueList.py b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_getDocumentValueList.py
index b790747323451f6657f4191abd87450d3ee2e7bd..14dea22532b745077c59b71ca9854d28d1dab22b 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_getDocumentValueList.py
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_getDocumentValueList.py
@@ -52,10 +52,10 @@ try:
   if not language:
     language = portal.Localizer.get_selected_language()
 
-  if 'portal_type' not in kw:
+  if not kw.get('portal_type'):
     kw['portal_type'] = portal.getPortalDocumentTypeList()
 
-  if 'validation_state' not in kw:
+  if not kw.get('validation_state'):
     # XXX hardcoded validation state list.
     # Use predicate or layout property instead
     kw['validation_state'] = ('released', 'released_alive', 'published',