Added support for strings in where clauses