Fix condition picker to handle "," in term name