Changes for supporting OR operand in searches