Fix for Or expression performance issue, this was as suggested by Dino.