Insuring that if there is a where clause it is encapsilated in side of a DatabaseCondition that can be altered (issue #1720830)