Fix up where clause.