Simplify queries, pending items and update layout again