Added checks for singer quantity and fixed a bug with singer names