Added "Where"
Added support for select and fix null parameters