cleanup to support complex query conditions
increment version