fixed catalogs. BooleanExpression still broken.