added attributes to query_data