added support for UDF, fixed issue with && and other ops