Enhancement for WHERE condition