Added ability to use String in criterion equals with basic types and enums.