added boolean and null comparisson support