Lots of fixes. Numerical id. Sort by id