add rest of fields
fix time sorting
Merge branch 'jquery'