add contained to both dimension and value condition query