Fix highlighting of multiple tagged queries