Improve the query results structure. Now are array of hashes