Updates done for allowing OR in queries