refined and unified data structure
solve the discrepencies after the query using GenericData