Change Virtuoso-specific placement of OPTIONAL causing incorrect GROUPing