Fix Batua in combined queries