Fix multiple && query, reintroduce envelope merging