Updated PQ value handling for data criteria