fix columns ordering on select * (again)
fix where clause bug