Postgres fix
Avoid N+1
Reorder charts
Reorder charts