Added criteria competition
Added criteria season
Fixed database table names