datetime conditions added
equals string conditions added
columns refactored