Updated querying and listing