Updated query + scroll