removed unnecessary fields_query