Yi - improve criteria expressions