CARE #124: Fixed computed fields in where conditions