Add new queries and order fields