X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=sql%2Fcc04%2Fcc5-04.sql;h=e2dca164a716c148473b84a9dd8a718b62c7eca8;hp=2bb2e31b5b127345734c0e74884472350be132e9;hb=aee1f77ca1957086ed876b49e1b5e4f744eef2f2;hpb=1c54093a61bb4f6633bc7649e72a33a2ccb3bb40

diff --git a/sql/cc04/cc5-04.sql b/sql/cc04/cc5-04.sql
index 2bb2e31..e2dca16 100644
--- a/sql/cc04/cc5-04.sql
+++ b/sql/cc04/cc5-04.sql
@@ -1,2647 +1,2885 @@
 begin;
 INSERT INTO tournaments 
-  (season, name, country, location, "date", machine, scoringsystem) VALUES (
-    (SELECT season FROM seasons WHERE name='Challenge Cup 2004'),
+  (season, tournamentname, country, location, "date", machine, scoringsystem) VALUES (
+    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'),
     'Challenge Cup 5 - NM',
-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),
     'OsloLan',
     '2004-10-02',
-    (SELECT machine FROM machines WHERE name='Dancing Stage EuroMix 2'),
-    (SELECT scoringsystem FROM scoringsystems WHERE name='10K Machine score')
+    (SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),
+    (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='10K Machine score')
 );
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Eruanna' AS nick WHERE 'Eruanna' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Eruanna'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Eruanna'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)')),
    'f',
    4721);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Eruanna'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)')),
    'f',
    0);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Eruanna'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    6966);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Andeplane' AS nick WHERE 'Andeplane' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)')),
    'f',
    5019);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)')),
    'f',
    6152);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    7108);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zeila' AS nick WHERE 'Zeila' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Zeila'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Zeila'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)')),
    'f',
    5066);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Zeila'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)')),
    'f',
    5352);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Zeila'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    7198);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)')),
    'f',
    6156);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)')),
    'f',
    7590);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8352);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bonzo' AS nick WHERE 'Bonzo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)')),
    'f',
    5813);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)')),
    'f',
    6831);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    7766);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)')),
    'f',
    6444);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)')),
    'f',
    7576);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('My Summer Love')),
    't',
    7626);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Chimera' AS nick WHERE 'Chimera' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Chimera'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Chimera'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    5567);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Chimera'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century')),
    'f',
    4361);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Chimera'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    5565);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Alexxz' AS nick WHERE 'Alexxz' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    5491);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century')),
    'f',
    6262);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    7712);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6086);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century')),
    'f',
    6603);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8273);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6327);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century')),
    'f',
    7596);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    7879);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pingo' AS nick WHERE 'Pingo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pingo'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pingo'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6255);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pingo'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century')),
    'f',
    7084);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pingo'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8287);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6772);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century')),
    'f',
    8406);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Spin the disc')),
    't',
    7950);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mickva' AS nick WHERE 'Mickva' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mickva'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mickva'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!')),
    'f',
    4465);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mickva'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move')),
    'f',
    4028);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mickva'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    5991);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick WHERE 'Havok' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!')),
    'f',
    4920);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move')),
    'f',
    4843);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    7321);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Felz' AS nick WHERE 'Felz' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!')),
    'f',
    5808);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move')),
    'f',
    5815);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    7912);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mync' AS nick WHERE 'Mync' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mync'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mync'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!')),
    'f',
    5263);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mync'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move')),
    'f',
    5942);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mync'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    't',
    8607);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gogo' AS nick WHERE 'Gogo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!')),
    'f',
    6737);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move')),
    'f',
    6570);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Spin the disc')),
    't',
    7713);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snute'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snute'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!')),
    'f',
    7205);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snute'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move')),
    'f',
    6463);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snute'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U')),
    't',
    7926);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Let the Beat Hit \'em!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ingviild' AS nick WHERE 'Ingviild' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ingviild'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ingviild'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    'f',
    5859);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ingviild'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let the Beat Hit \'em!')),
    'f',
    4881);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ingviild'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    6608);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ngan' AS nick WHERE 'Ngan' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ngan'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ngan'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    'f',
    6613);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ngan'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let the Beat Hit \'em!')),
    'f',
    5443);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ngan'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century')),
    't',
    5594);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Cuivien' AS nick WHERE 'Cuivien' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Cuivien'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Cuivien'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    'f',
    7812);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Cuivien'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let the Beat Hit \'em!')),
    'f',
    6291);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Cuivien'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    8215);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Daniil'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Daniil'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    'f',
    8313);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Daniil'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let the Beat Hit \'em!')),
    'f',
    6442);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Daniil'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    't',
    8048);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    'f',
    8573);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let the Beat Hit \'em!')),
    'f',
    6436);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    8156);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    'f',
    7958);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let the Beat Hit \'em!')),
    'f',
    6351);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    8482);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Maxion' AS nick WHERE 'Maxion' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Maxion'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Maxion'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    'f',
    5747);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Maxion'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    'f',
    6617);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Maxion'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Hypnotic Crisis')),
    't',
    5844);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Lindaninja' AS nick WHERE 'Lindaninja' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Lindaninja'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Lindaninja'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    'f',
    6165);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Lindaninja'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    'f',
    6631);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Lindaninja'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    7569);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Asphodel' AS nick WHERE 'Asphodel' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Asphodel'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Asphodel'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    'f',
    7341);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Asphodel'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    'f',
    6061);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Asphodel'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    7656);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Cehtna' AS nick WHERE 'Cehtna' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Cehtna'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Cehtna'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    'f',
    7809);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Cehtna'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    'f',
    7520);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Cehtna'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)')),
    't',
    7030);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    'f',
    8235);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    'f',
    7930);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Jam Jam Reggae (AM Swing Mix)')),
    't',
    7759);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Ylini'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Ylini'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    'f',
    8154);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Ylini'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    'f',
    7758);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Ylini'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Jam Jam Reggae (AM Swing Mix)')),
    't',
    7463);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='OJK'),
    7
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='OJK'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    'f',
    8580);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='OJK'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    'f',
    8478);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='OJK'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita')),
    't',
    8195);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Athena' AS nick WHERE 'Athena' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Athena'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Athena'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita')),
    'f',
    4975);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Athena'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova')),
    'f',
    5292);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Athena'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Spin the disc')),
    't',
    6141);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Andre' AS nick WHERE 'Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Andre'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Andre'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita')),
    'f',
    5503);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Andre'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova')),
    'f',
    5618);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Andre'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Spin the disc')),
    't',
    6345);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Marilla' AS nick WHERE 'Marilla' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita')),
    'f',
    5338);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova')),
    'f',
    5008);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    6534);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ozon' AS nick WHERE 'Ozon' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita')),
    'f',
    6040);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova')),
    'f',
    6589);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    8005);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haanz' AS nick WHERE 'Haanz' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Haanz'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Haanz'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita')),
    'f',
    4809);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Haanz'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova')),
    'f',
    6176);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Haanz'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    't',
    7953);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita')),
    'f',
    6040);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova')),
    'f',
    8064);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)')),
    't',
    7648);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    7
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita')),
    'f',
    6274);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova')),
    'f',
    7686);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Spin the disc')),
    't',
    7587);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Hypnotic Crisis'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bonzo' AS nick WHERE 'Bonzo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    'f',
    8122);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Hypnotic Crisis')),
    'f',
    7553);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8550);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mync' AS nick WHERE 'Mync' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    'f',
    7831);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Hypnotic Crisis')),
    'f',
    7442);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8239);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    'f',
    8742);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Hypnotic Crisis')),
    'f',
    8478);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave')),
    't',
    8785);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    'f',
    8218);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Hypnotic Crisis')),
    'f',
    7626);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    8773);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    'f',
    8734);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Hypnotic Crisis')),
    'f',
    8640);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave')),
    't',
    8773);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    'f',
    8692);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Hypnotic Crisis')),
    'f',
    7952);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave')),
    't',
    8653);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Silent Hill'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ozon' AS nick WHERE 'Ozon' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ozon'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ozon'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Silent Hill')),
    'f',
    6062);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ozon'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It')),
    'f',
    6369);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ozon'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8251);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Silent Hill')),
    'f',
    6416);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It')),
    'f',
    6971);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8504);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Silent Hill')),
    'f',
    6535);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It')),
    'f',
    6863);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8476);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Silent Hill')),
    'f',
    6705);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It')),
    'f',
    6938);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8378);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Silent Hill')),
    'f',
    6565);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It')),
    'f',
    7037);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8454);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Silent Hill')),
    'f',
    6181);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It')),
    'f',
    6748);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8457);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)')),
    'f',
    5689);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    'f',
    8037);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8235);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pingo' AS nick WHERE 'Pingo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)')),
    'f',
    6172);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    'f',
    8011);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    8558);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gogo' AS nick WHERE 'Gogo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)')),
    'f',
    6544);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    'f',
    8240);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8820);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)')),
    'f',
    5960);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    'f',
    8158);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8486);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)')),
    'f',
    6287);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    'f',
    7795);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8495);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)')),
    'f',
    6870);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    'f',
    8658);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
+   2,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova')),
    't',
    8677);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=3;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    'f',
    8665);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8561);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pingo' AS nick WHERE 'Pingo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    'f',
    8071);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8262);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    'f',
    8651);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8731);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    'f',
    7787);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8652);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    'f',
    8492);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8654);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gogo' AS nick WHERE 'Gogo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    'f',
    8267);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8734);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    7
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    'f',
    8565);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8643);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    8
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    'f',
    8580);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)')),
    't',
    8693);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    9
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    'f',
    8805);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)')),
    't',
    8819);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=4;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gogo' AS nick WHERE 'Gogo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6387);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)')),
    't',
    7925);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6883);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    't',
    8820);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6593);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    't',
    8561);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6498);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8723);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6765);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8606);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    6
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6536);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
    't',
    8855);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    7
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor')),
    'f',
    6884);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8757);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Vanity Angel'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=5;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Vanity Angel')),
    'f',
    7858);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    8472);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Vanity Angel')),
    'f',
    8682);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8800);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Vanity Angel')),
    'f',
    8257);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    't',
    8754);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Vanity Angel')),
    'f',
    8741);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8766);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    5
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Vanity Angel')),
    'f',
    8403);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8604);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Rain of Sorrow'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=6;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Rain of Sorrow')),
    'f',
    8198);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    9195);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Rain of Sorrow')),
    'f',
    7744);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    8691);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Rain of Sorrow')),
    'f',
    8365);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Trip Machine Climax')),
    't',
    8600);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Rain of Sorrow')),
    'f',
    8455);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    8875);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=7;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave')),
    'f',
    8550);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    8972);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave')),
    'f',
    8763);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8905);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave')),
    'f',
    8516);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8070);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Hysteria 2001'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=8;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=8;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Hysteria 2001')),
    'f',
    6621);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    't',
    8891);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Hysteria 2001')),
    'f',
    6634);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    9672);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Higher'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=9;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=9;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Ylini'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Ylini'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Higher')),
    'f',
    5271);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Ylini'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    7905);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Higher')),
    'f',
    5683);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    't',
    8381);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    3
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='T|na'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Higher')),
    'f',
    5509);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='T|na'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    't',
    8471);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=10;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=10;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='T|na'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    'f',
    8343);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='T|na'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8674);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2
 );
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
+   0,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    'f',
    8013);
-INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
+   1,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    7325);