[ADD] added null whereFields and whereValues support