Fix OEH in combined queries