Added handling of equijoins