query.condition package improvements