Adjusted where clause