Fix :or inside :where and :having