add rest of fields
fix time sorting