Add extra Query args to for optimization