added support for AND, OR, <, > expressions in where clause