Bug fix for from/to criterias