Shorten query errors and fix scroll bug