Switch to where clause syntax