Fixed Mokoroa loading in combined queries