added support for andWhere, orWhere without leading where, ref #90