change query approach