significantly enhanced QueryBuilder and enforcer methods