updated where clause grammar