Modify where clause

where clause now only accepts where statements
improved where search