Added all the query fields