Refactor where clause building
Add support for comparison operators