Changes to logic queries