change query and includes