restructured results to conform with new database schema