Fixing json and reordering with db script
Update for #1