Omit empty reports + psql -> sql rename