Merge "Preserve 'ooui' query string when overriding"