Fix literal to identifier
Add all basic where comparators