Fix Mokoroa in combined query