Simplification of parsing the queries results. Fixed