Fix an issue with the get round query.
Fix a bug on the round generation.