diff --git a/legacy/Dockerfile b/legacy/Dockerfile
index 50c737a2..c3db8b17 100644
--- a/legacy/Dockerfile
+++ b/legacy/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7-fpm
+FROM php:8-fpm
 
 # Use the default production configuration
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
@@ -8,13 +8,26 @@ RUN docker-php-ext-install iconv
 RUN apt install -y libicu-dev && docker-php-ext-install intl
 RUN apt install -y libpq-dev && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql && docker-php-ext-install pgsql
 
+# Curl
+ENV CURL_VERSION=8.9.1
+RUN curl -L https://github.com/stunnel/static-curl/releases/download/${CURL_VERSION}/curl-linux-aarch64-${CURL_VERSION}.tar.xz --output /tmp/curl.tar.xz && \
+    tar -xvf /tmp/curl.tar.xz -C /tmp && \
+    sha256sum /tmp/curl | grep -q "eff254056270ded081d677f2f04847817a1be692283bd5b37fbc379bed8d5461" && \
+    mv /tmp/curl /usr/local/bin/curl && \
+    rm /tmp/curl.tar.xz
+
 # Configure python
 COPY requirements.txt .
-RUN apt install -y python3 python3-pip && pip install -r requirements.txt
+RUN apt install -y python3 python3-pip python3-venv && \
+    python3 -m venv /venv/legacy && \
+    /venv/legacy/bin/pip install -U pip && \
+    /venv/legacy/bin/pip install -r requirements.txt
+ENV PATH="/venv/legacy/bin/:$PATH"
 
 # Configure cron
 RUN apt install -y cron
 COPY cron /etc/cron.d/clist
+RUN echo "PATH=$PATH" | cat - /etc/cron.d/clist > temp && mv temp /etc/cron.d/clist
 RUN chmod 0644 /etc/cron.d/clist
 RUN crontab /etc/cron.d/clist
 
diff --git a/legacy/cron b/legacy/cron
index d523d174..8d33c976 100644
--- a/legacy/cron
+++ b/legacy/cron
@@ -1,3 +1,2 @@
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 7,25,42 * * * * /usr/src/legacy/update.bash >/usr/src/legacy/logs/cron.log 2>&1
diff --git a/legacy/db.class.php b/legacy/db.class.php
index f8c6c938..cc486bf3 100755
--- a/legacy/db.class.php
+++ b/legacy/db.class.php
@@ -2,6 +2,14 @@
     $is_debug = true;
     class db
     {
+        private string $host;
+        private string $dbname;
+        private int $port;
+        private string $username;
+        private string $password;
+        private $link;
+        private $result;
+
         function __construct()
         {
             $db_conf = parse_ini_file("/run/secrets/db_conf");
diff --git a/legacy/helper.php b/legacy/helper.php
index 31ebe5f8..53691a82 100755
--- a/legacy/helper.php
+++ b/legacy/helper.php
@@ -168,11 +168,11 @@ function curlexec(&$url, $postfields = NULL, $params = array())
             echo "url = $url\n";
         }
 
-        // echo "curl_setopt(CURLOPT_URL, $url)\n";
         empty($url) && die("Empty URL on " . __FILE__ . ":" . __LINE__);
         curl_setopt($CID, CURLOPT_URL, $url);
 
-        $header = array('Accept-Language: en;q=0.8, ru;q=0.2');
+        $header = array();
+        $header[] = 'Accept-Language: en;q=0.8, ru;q=0.2';
         if (isset($params["http_header"])) {
             $header = array_merge($header, $params["http_header"]);
         }
@@ -193,13 +193,30 @@ function curlexec(&$url, $postfields = NULL, $params = array())
             curl_setopt($CID, CURLOPT_POST, false);
         }
 
+        $with_curl = isset($params["with_curl"]) && $params["with_curl"];
+
         if (CACHE && $postfields === NULL && file_exists($cachefile))
         {
             $page = file_get_contents($cachefile);
         }
         else
         {
-            $page = curl_exec($CID);
+            if ($with_curl) {
+                $command = "curl -i {$url} -L --silent";
+                foreach ($header as $h) {
+                    $command .= " -H " . escapeshellarg($h);
+                }
+                if ($postfields !== NULL) {
+                    $postfields = http_build_query($postfields);
+                    $command .= " --data " . escapeshellarg($postfields);
+                }
+                if (isset($params["cookie_file"])) {
+                    $command .= " -b " . escapeshellarg($params["cookie_file"]) . " -c " . escapeshellarg($params["cookie_file"]);
+                }
+                $page = shell_exec($command);
+            } else {
+                $page = curl_exec($CID);
+            }
             if (preg_match('#charset=["\']?([-a-z0-9]+)#i', $page, $match))
             {
                 $charset = $match[1];
@@ -254,7 +271,16 @@ function curlexec(&$url, $postfields = NULL, $params = array())
                 $COOKIE[$k] = $v;
             }
         }
-        $url = curl_getinfo($CID, CURLINFO_EFFECTIVE_URL);
+        if ($with_curl) {
+            if (isset($header['location'])) {
+                $url = $header['location'];
+                if (is_array($url)) {
+                    $url = end($url);
+                }
+            }
+        } else {
+            $url = curl_getinfo($CID, CURLINFO_EFFECTIVE_URL);
+        }
         return $page;
     }
 
@@ -447,6 +473,11 @@ function unparse_url($parsed_url)
         return "$scheme$user$pass$host$port$path$query$fragment";
     }
 
+
+    function parse_schema_host($url) {
+        return parse_url($url, PHP_URL_SCHEME) . "://" . parse_url($url, PHP_URL_HOST);
+    }
+
     function url_merge($original, $new, $merge_query = false)
     {
         if (is_string($original)) {
diff --git a/legacy/libs/smarty b/legacy/libs/smarty
index dd55b231..9fc96a13 160000
--- a/legacy/libs/smarty
+++ b/legacy/libs/smarty
@@ -1 +1 @@
-Subproject commit dd55b23121e55a3b4f1af90a707a6c4e5969530f
+Subproject commit 9fc96a13dbaf546c3d7bcf95466726578cd4e0fa
diff --git a/legacy/module/ac.nowcoder.com/index.php b/legacy/module/ac.nowcoder.com/index.php
new file mode 100755
index 00000000..2ac5c8f2
--- /dev/null
+++ b/legacy/module/ac.nowcoder.com/index.php
@@ -0,0 +1,81 @@
+<?php
+    require_once dirname(__FILE__) . "/../../config.php";
+
+    $seen = array();
+
+    function process_url($url) {
+        global $contests, $RID, $HOST, $TIMEZONE;
+        global $seen;
+
+        $page = curlexec($url);
+        preg_match_all('#<div[^>]*data-id="(?P<id>[^"]*)"[^<]*data-json="(?P<data>[^"]*)"[^>]*>#', $page, $matches, PREG_SET_ORDER);
+        $n_parsed = 0;
+
+        foreach ($matches as $_ => $match) {
+            $data = html_entity_decode($match['data']);
+            $data = html_entity_decode($data);
+            $data = json_decode($data, true);
+
+            $type = pop_item($data, 'type');
+            if ($type == 0) {
+                $kind = 'ACM';
+                $standings_kind = 'icpc';
+            } elseif ($type == 3) {
+                $kind = 'IOI';
+                $standings_kind = 'scoring';
+            } elseif ($type == 2) {
+                $kind = 'OI';
+                $standings_kind = 'scoring';
+            } else {
+                $kind = null;
+                $standings_kind = null;
+            }
+
+            $title = html_entity_decode(pop_item($data, 'contestName'));
+            if ($kind) {
+                $title .= " [$kind]";
+            }
+
+            $key = pop_item($data, 'contestId');
+
+            $contest = [
+                'title' => $title,
+                'start_time' => pop_item($data, 'contestStartTime') / 1000,
+                'end_time' => pop_item($data, 'contestEndTime') / 1000,
+                'duration' => pop_item($data, 'contestDuration') / 1000 / 60,
+                'url' => "https://ac.nowcoder.com/acm/contest/{$key}",
+                'key' => $key,
+                'rid' => $RID,
+                'host' => $HOST,
+                'timezone' => $TIMEZONE,
+                'info' => ['parse' => $data],
+            ];
+
+            if ($standings_kind) {
+                $contest['standings_kind'] = $standings_kind;
+            }
+
+            $contests[] = $contest;
+
+            if (!isset($seen[$key])) {
+                $seen[$key] = true;
+                $n_parsed += 1;
+            }
+        }
+        return $n_parsed;
+    }
+
+    process_url($URL);
+
+    $page = 1;
+    $base_url = parse_schema_host($URL) .  '/acm/contest/vip-end-index?orderType=DESC';
+
+    for ($page = 1; ; $page++) {
+        $url = $base_url . "&page=$page";
+        $ok = process_url($url);
+
+        if (!$ok || !isset($_GET['parse_full_list'])) {
+            break;
+        }
+    }
+?>
diff --git a/legacy/module/acmp.ru/index.php b/legacy/module/acmp.ru/index.php
index a41e35e9..8716abe2 100644
--- a/legacy/module/acmp.ru/index.php
+++ b/legacy/module/acmp.ru/index.php
@@ -20,7 +20,7 @@
         }
 
         if (DEBUG) {
-            echo "$year - ${match['title']}\n";
+            echo "$year - {$match['title']}\n";
         }
 
         preg_match_all('#<a[^>]*href="?(?P<href>[^ ">]*)"?>\[Описание\]</a>#', $page, $matches, PREG_SET_ORDER);
diff --git a/legacy/module/adventofcode.com/index.php b/legacy/module/adventofcode.com/index.php
index 8ccd81b4..42a44fd2 100755
--- a/legacy/module/adventofcode.com/index.php
+++ b/legacy/module/adventofcode.com/index.php
@@ -51,7 +51,7 @@
         preg_match_all('#<a[^>]*aria-label="(?P<label>[^"]*)"[^>]*href="(?P<href>[^>]*/day/[^>]*)"[^>]*class="calendar-day(?P<day>[0-9]+)"[^>]*>#', $page, $matches, PREG_SET_ORDER);
         foreach ($matches as $match) {
             $day = $match['day'];
-            $title = "$name. ${match['label']}";
+            $title = "$name. {$match['label']}";
             $contests[] = array(
                 'start_time' => "$day.12.$year 00:00",
                 'duration' => '00:00',
diff --git a/legacy/module/beecrowd.com.br/index.php b/legacy/module/beecrowd.com.br/index.php
index f9c6b0f4..a4b303ce 100644
--- a/legacy/module/beecrowd.com.br/index.php
+++ b/legacy/module/beecrowd.com.br/index.php
@@ -1,9 +1,19 @@
 <?php
     require_once dirname(__FILE__) . '/../../config.php';
+    $url_scheme_host = parse_url($URL, PHP_URL_SCHEME) . "://" . parse_url($URL, PHP_URL_HOST);
+
+    $user_agent_file = dirname(__FILE__) . "/../../logs/beecrowd.user_agent";
+    $cookie_file = dirname(__FILE__) . "/../../logs/beecrowd.cookie";
+    $header = array();
+    if (file_exists($user_agent_file)) {
+        $user_agent = trim(file_get_contents($user_agent_file));
+        $header[] = "User-Agent: $user_agent";
+    }
+    $curlexec_params = ['http_header' => $header, 'with_curl' => true, 'cookie_file' => $cookie_file];
 
     for ($n_page = 1;; $n_page += 1) {
-        $url = "https://www.beecrowd.com.br/judge/en/contests?page=$n_page";
-        $page = curlexec($url);
+        $url = $url_scheme_host . "/en/contests?page=$n_page";
+        $page = curlexec($url, null, $curlexec_params);
 
         if (strpos($url, '/login') !== false) {
             preg_match_all('#<input[^>]*name="(?P<name>[^"]*)"(?:[^>]*value="(?P<value>[^"]*)")?[^>]*>#', $page, $matches, PREG_SET_ORDER);
@@ -14,7 +24,7 @@
             require_once dirname(__FILE__) . '/secret.php';
             $fields['email'] = $BEECROWD_EMAIL;
             $fields['password'] = $BEECROWD_PASSWORD;
-            $page = curlexec($url, $fields);
+            $page = curlexec($url, $fields, $curlexec_params);
         }
 
         preg_match_all('#
@@ -36,7 +46,7 @@
             $url = url_merge($URL, $c['url']);
             $title = $c['title'];
             if (substr($title, -3) == '...') {
-                $page = curlexec($url);
+                $page = curlexec($url, null, $curlexec_params);
                 if (preg_match('#</h2>\s*<p[^>]*>(?P<title>[^<]*)</p>#', $page, $match)) {
                     $title = $match['title'];
                 }
diff --git a/legacy/module/bubblecup.org/index.php b/legacy/module/bubblecup.org/index.php
index ff9d1b0c..81fe07bc 100755
--- a/legacy/module/bubblecup.org/index.php
+++ b/legacy/module/bubblecup.org/index.php
@@ -21,8 +21,8 @@
             continue;
         }
 
-        $year = strftime('%Y', strtotime($match['start_time']));
-        $month = intval(strftime('%m', strtotime($match['start_time'])));
+        $year = date('Y', strtotime($match['start_time']));
+        $month = intval(date('m', strtotime($match['start_time'])));
         if ($month >= 9) {
             $year = $year + 1;
         }
diff --git a/legacy/module/challenges.reply.com/index.php b/legacy/module/challenges.reply.com/index.php
index ac395bcb..1d2863bb 100644
--- a/legacy/module/challenges.reply.com/index.php
+++ b/legacy/module/challenges.reply.com/index.php
@@ -17,7 +17,7 @@
             trigger_error("Invalid singin: $data", E_USER_WARNING);
             return;
         } else if (!isset($data["message"]) || strpos(strtolower($data["message"]), "success") === false) {
-            trigger_error("Invalid singin: ${data['message']}", E_USER_WARNING);
+            trigger_error("Invalid singin: {$data['message']}", E_USER_WARNING);
             return;
         }
         $url = 'https://challenges.reply.com/tamtamy/api/user-in-session.json';
diff --git a/legacy/module/codeforces.com-gym/index.php b/legacy/module/codeforces.com-gym/index.php
index 75593757..6309ac4f 100755
--- a/legacy/module/codeforces.com-gym/index.php
+++ b/legacy/module/codeforces.com-gym/index.php
@@ -27,7 +27,7 @@
     }
     if ($json['status'] != 'OK') {
         $json_str = print_r($json, true);
-        trigger_error("status = ${json['status']}, json = $json_str", E_USER_WARNING);
+        trigger_error("status = {$json['status']}, json = $json_str", E_USER_WARNING);
         return;
     }
 
diff --git a/legacy/module/codeforces.com/index.php b/legacy/module/codeforces.com/index.php
index c3d846ef..d9e7bbca 100755
--- a/legacy/module/codeforces.com/index.php
+++ b/legacy/module/codeforces.com/index.php
@@ -47,7 +47,7 @@
     if (!is_array($json)) {
         return;
     }
-    $json['status'] == 'OK' or trigger_error("status = '${json['status']}' for $url");
+    $json['status'] == 'OK' or trigger_error("status = '{$json['status']}' for $url");
     $global_rounds_stage_year = false;
     foreach ($json['result'] as $c) {
         $title = $c['name'];
diff --git a/legacy/module/coderun.yandex.ru/index.php b/legacy/module/coderun.yandex.ru/index.php
index 0995ec3c..160aa106 100644
--- a/legacy/module/coderun.yandex.ru/index.php
+++ b/legacy/module/coderun.yandex.ru/index.php
@@ -20,7 +20,7 @@
     $url = "/api/seasons/$slug/season-info";
     $data = curlexec($url, null, ['json_output' => true]);
     if (isset($data['error'])) {
-      trigger_error("Warning error on $slug season: ${data['error']}", E_USER_WARNING);
+      trigger_error("Warning error on $slug season: {$data['error']}", E_USER_WARNING);
       continue;
     }
     $data = get_item($data, ['result']);
@@ -29,7 +29,7 @@
       $data['slug'] = $slug;
       $data['track'] = $track;
       $title = $data['title'] . '. ' . $track['title'];
-      $url = url_merge($HOST_URL, "/seasons/$slug/tracks/${track['slug']}/");
+      $url = url_merge($HOST_URL, "/seasons/$slug/tracks/{$track['slug']}/");
       $start_time = $data['startDate'];
       $end_time = $data['endDate'];
       $key = $slug . '/' . $track['slug'];
diff --git a/legacy/module/codingninjas.com_codestudio/index.php b/legacy/module/codingninjas.com_codestudio/index.php
index 79eaac09..eb5f9168 100644
--- a/legacy/module/codingninjas.com_codestudio/index.php
+++ b/legacy/module/codingninjas.com_codestudio/index.php
@@ -30,7 +30,7 @@
                 'start_time' => $start_time,
                 'end_time' => $end_time,
                 'title' => $c['name'],
-                'url' => "$URL/${c['slug']}",
+                'url' => "$URL/{$c['slug']}",
                 'host' => $HOST,
                 'rid' => $RID,
                 'timezone' => $TIMEZONE,
diff --git a/legacy/module/ctftime.org/index.php b/legacy/module/ctftime.org/index.php
index d14e5f42..9ecb7c79 100755
--- a/legacy/module/ctftime.org/index.php
+++ b/legacy/module/ctftime.org/index.php
@@ -14,7 +14,7 @@
     }
     foreach ($data["items"] as $item) {
         if (!preg_match("#https?[^\s]*$#", $item["description"], $matches)) {
-            trigger_error("No found url in ${item["description"]}", E_USER_WARNING);
+            trigger_error("No found url in {$item["description"]}", E_USER_WARNING);
         }
         $url = $matches[0];
 
diff --git a/legacy/module/dphi.tech/index.php b/legacy/module/dphi.tech/index.php
index 8a29fdf6..92566c2f 100644
--- a/legacy/module/dphi.tech/index.php
+++ b/legacy/module/dphi.tech/index.php
@@ -15,7 +15,7 @@
             }
 
             foreach ($response['results'] as $c) {
-                $cid = "${c['challenge_id']}";
+                $cid = "{$c['challenge_id']}";
 
                 $title = $c['title'];
                 if ($c['datathon_type']) {
@@ -26,7 +26,7 @@
                     'start_time' => $c['start_date'],
                     'end_time' => $c['end_date'],
                     'title' => $title,
-                    'url' => url_merge($URL, "/challenges/${c['slug']}/$cid/"),
+                    'url' => url_merge($URL, "/challenges/{$c['slug']}/$cid/"),
                     'host' => $HOST,
                     'rid' => $RID,
                     'timezone' => $TIMEZONE,
diff --git a/legacy/module/facebook.com/index.php b/legacy/module/facebook.com/index.php
index 15126d11..002ddad8 100755
--- a/legacy/module/facebook.com/index.php
+++ b/legacy/module/facebook.com/index.php
@@ -176,7 +176,7 @@ function get_ids($page) {
         foreach ($season['season_contests']['nodes'] as $node) {
             $info = array('parse' => $node);
             $year = $node['contest_season']['season_vanity'];
-            $url = rtrim($URL, '/') . "/$year/${node['contest_vanity']}";
+            $url = rtrim($URL, '/') . "/$year/{$node['contest_vanity']}";
             $scoreboard_url = rtrim($url) . '/scoreboard';
             $url_ = $scoreboard_url;
             $scoreboard_page = curlexec($url_);
diff --git a/legacy/module/geeksforgeeks.org/index.php b/legacy/module/geeksforgeeks.org/index.php
index 6fc82f50..bf1267c3 100644
--- a/legacy/module/geeksforgeeks.org/index.php
+++ b/legacy/module/geeksforgeeks.org/index.php
@@ -31,7 +31,7 @@
                 'start_time' => $c['start_time'],
                 'end_time' => $c['end_time'],
                 'title' => $title,
-                'url' => url_merge($URL, "/contest/${c["slug"]}/"),
+                'url' => url_merge($URL, "/contest/{$c["slug"]}/"),
                 'host' => $HOST,
                 'rid' => $RID,
                 'timezone' => $TIMEZONE,
diff --git a/legacy/module/highload.fun/index.php b/legacy/module/highload.fun/index.php
index 80547530..11c858ea 100755
--- a/legacy/module/highload.fun/index.php
+++ b/legacy/module/highload.fun/index.php
@@ -3,7 +3,7 @@
 
     $data = curlexec($URL, null, array("json_output" => 1));
     if ($data['result'] !== 'OK') {
-        trigger_error("Failed to fetch data, result = '${data['result']}', error = '${data['error']}'", E_USER_WARNING);
+        trigger_error("Failed to fetch data, result = '{$data['result']}', error = '{$data['error']}'", E_USER_WARNING);
         return;
     }
 
@@ -14,8 +14,8 @@
                 'start_time' => pop_item($round, 'round_from'),
                 'end_time' => pop_item($round, 'round_to'),
                 'title' => $contest['caption'] . '. ' . $round['caption'],
-                'url' => url_merge($HOST_URL, "/timed_competitions/${contest['id']}"),
-                'standings_url' => url_merge($HOST_URL, "/timed_competitions/${contest['id']}/leaderboard/${round['id']}/"),
+                'url' => url_merge($HOST_URL, "/timed_competitions/{$contest['id']}"),
+                'standings_url' => url_merge($HOST_URL, "/timed_competitions/{$contest['id']}/leaderboard/{$round['id']}/"),
                 'host' => $HOST,
                 'rid' => $RID,
                 'timezone' => $TIMEZONE,
diff --git a/legacy/module/kaggle.com/index.php b/legacy/module/kaggle.com/index.php
index c5c8dd9a..1b3f497b 100755
--- a/legacy/module/kaggle.com/index.php
+++ b/legacy/module/kaggle.com/index.php
@@ -36,7 +36,7 @@
                 $ok = true;
                 foreach (array('id', 'title', 'competitionName', 'dateEnabled', 'deadline') as $f) {
                     if (!isset($c[$f])) {
-                        trigger_error("Not found ${f} field", E_USER_WARNING);
+                        trigger_error("Not found {$f} field", E_USER_WARNING);
                         $ok = false;
                         break;
                     }
diff --git a/legacy/module/karelia.snarknews.info/index.php b/legacy/module/karelia.snarknews.info/index.php
index 1f22dc84..97eaf6f1 100755
--- a/legacy/module/karelia.snarknews.info/index.php
+++ b/legacy/module/karelia.snarknews.info/index.php
@@ -114,7 +114,7 @@ function ($match) {
             if ($i < count($schedule)) {
                 $s = $schedule[$i];
                 if (!isset($data['date'])) {
-                    $data['date'] = strftime('%B %d, %Y', strtotime($s['date']));
+                    $data['date'] = date('F d, Y', strtotime($s['date']));
                 }
                 $data['start_time'] = $s['start_time'];
                 if (isset($s['end_time'])) {
@@ -123,19 +123,19 @@ function ($match) {
             } else {
                 $data['start_time'] = '10:00';
                 if (empty($schedule) && !isset($data['date']) && $camp_season) {
-                    $data['date'] = strftime('%B %d, %Y', $base_date + ($i - count($matches) + 1) * $DAY);
+                    $data['date'] = date('F d, Y', $base_date + ($i - count($matches) + 1) * $DAY);
                 }
             }
             $days[intval($values['day'])] = $data;
         }
         foreach ($days as $day => $data) {
             if (!isset($data['date']) && isset($days[$day - 1]) && isset($days[$day - 1]['date'])) {
-                $days[$day]['date'] = strftime('%B %d, %Y', strtotime($days[$day - 1]['date']) + 24 * 60 * 60);
+                $days[$day]['date'] = date('F d, Y', strtotime($days[$day - 1]['date']) + 24 * 60 * 60);
             }
         }
         foreach (array_reverse($days, true) as $day => $data) {
             if (!isset($data['date']) && isset($days[$day + 1]) && isset($days[$day + 1]['date'])) {
-                $days[$day]['date'] = strftime('%B %d, %Y', strtotime($days[$day + 1]['date']) - 24 * 60 * 60);
+                $days[$day]['date'] = date('F d, Y', strtotime($days[$day + 1]['date']) - 24 * 60 * 60);
             }
         }
 
diff --git a/legacy/module/luogu.com.cn/index.php b/legacy/module/luogu.com.cn/index.php
index 1c3425dc..3cd253f4 100755
--- a/legacy/module/luogu.com.cn/index.php
+++ b/legacy/module/luogu.com.cn/index.php
@@ -14,6 +14,7 @@
             $key = array_pop_assoc($c, 'id');
             $title = trim(array_pop_assoc($c, 'name'));
             $kind = null;
+            $standings_kind = null;
 
             $rule_type = array_pop_assoc($c, 'ruleType');
             if ($rule_type == 2) {
diff --git a/legacy/module/nerc.itmo.ru_school/index.php b/legacy/module/nerc.itmo.ru_school/index.php
index 59f39c82..4643b159 100755
--- a/legacy/module/nerc.itmo.ru_school/index.php
+++ b/legacy/module/nerc.itmo.ru_school/index.php
@@ -88,7 +88,7 @@ function replace_months($page, $with_year) {
             $title = htmlspecialchars_decode($title);
             $title = preg_replace('#\s+#', ' ', trim($title));
 
-            $key = "${season}_vkoshp";
+            $key = "{$season}_vkoshp";
 
             $_contests[$key] = array(
                 'start_time' => $date,
diff --git a/legacy/module/nerc.itmo.ru_trains/index.php b/legacy/module/nerc.itmo.ru_trains/index.php
index 9c29209a..585c03c3 100755
--- a/legacy/module/nerc.itmo.ru_trains/index.php
+++ b/legacy/module/nerc.itmo.ru_trains/index.php
@@ -7,7 +7,7 @@
     $title = 'NRU ITMO Training';
     for ($i = 0; $i < 10; $i++)
     {
-        $day = strftime('%A', $start_time);
+        $day = date('l', $start_time);
         if (preg_match('/Contests will be[^<]*' . $day . '/', $page)) {
             if ($start_time > time()) {
                 $contests[] = array(
diff --git a/legacy/module/olympiads.ru/index.php b/legacy/module/olympiads.ru/index.php
index 862f0b30..4fb0503d 100755
--- a/legacy/module/olympiads.ru/index.php
+++ b/legacy/module/olympiads.ru/index.php
@@ -207,6 +207,9 @@
 
             foreach ($standings as $ind => $s) {
                 $date = strtotime($s['date']);
+                if (is_null($end_time)) {
+                    continue;
+                }
                 $end = strtotime($end_time);
                 if ($title != $long_title && $date < $end) {
                     continue;
diff --git a/legacy/module/projecteuler.net/index.php b/legacy/module/projecteuler.net/index.php
index c704208f..a5eaaae9 100644
--- a/legacy/module/projecteuler.net/index.php
+++ b/legacy/module/projecteuler.net/index.php
@@ -38,7 +38,7 @@
         );
 
         foreach ($matches as $match) {
-            $title = strip_tags("Problem ${match['key']}. ${match['name']}");
+            $title = strip_tags("Problem {$match['key']}. {$match['name']}");
             $contests[] = array(
                 'start_time' => $match['start_time'],
                 'duration' => '00:00',
diff --git a/legacy/module/robocontest.uz/index.php b/legacy/module/robocontest.uz/index.php
index 3d70f7b9..b9b4e1f8 100644
--- a/legacy/module/robocontest.uz/index.php
+++ b/legacy/module/robocontest.uz/index.php
@@ -33,6 +33,12 @@
                 $values[$k] = trim($match['value']);
             }
 
+            foreach (array('starts at', 'finishes at', 'duration') as $k) {
+                if (!isset($values[$k])) {
+                    continue 1;
+                }
+            }
+
             $a = explode(':', $values['duration'], -1);
             $duration = implode(':', $a);
 
diff --git a/legacy/module/supecoder.dev/index.php b/legacy/module/supecoder.dev/index.php
index 41deea50..551ffcbe 100644
--- a/legacy/module/supecoder.dev/index.php
+++ b/legacy/module/supecoder.dev/index.php
@@ -6,7 +6,7 @@
     $url = "$URL/api/contests?page=$page&limit=10&sortBy=startTime&sortOrder=desc";
     $data = curlexec($url, null, ['json_output' => true]);
     foreach ($data['data'] as $c) {
-      $url = url_merge($HOST_URL, "/contest/${c['slug']}?contestId=${c['_id']}");
+      $url = url_merge($HOST_URL, "/contest/{$c['slug']}?contestId={$c['_id']}");
       $contests[] = array(
         'start_time' => $c['startTime'],
         'end_time' => $c['endTime'],
diff --git a/requirements.txt b/requirements.txt
index 1537324e..c65e7d92 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -104,3 +104,6 @@ ipwhois==1.2.0
 fontawesomefree==6.5.1
 brotli==1.0.9
 geoip2==4.8.0
+xgboost==2.1.1
+scikit-learn==1.5.1
+pandas==2.2.2
diff --git a/src/clist/admin.py b/src/clist/admin.py
index c74a16d9..0bd54f8a 100644
--- a/src/clist/admin.py
+++ b/src/clist/admin.py
@@ -142,8 +142,8 @@ def queryset(self, request, queryset):
         ['Account information', {'fields': ['has_accounts_infos_update', 'n_accounts_to_update', 'has_multi_account',
                                             'has_account_verification', 'has_standings_renamed_account',
                                             'skip_for_contests_chart', 'accounts_fields']}],
-        ['Problem information', {'fields': ['has_problem_rating', 'has_problem_update', 'has_upsolving',
-                                            'problems_fields']}],
+        ['Problem information', {'fields': ['has_problem_rating', 'has_problem_update', 'has_new_problems',
+                                            'has_upsolving', 'problems_fields', 'problem_rating_predictor']}],
         ['Statistics information', {'fields': ['statistics_fields']}],
         ['Other information', {'fields': ['info']}],
     ]
diff --git a/src/clist/api/v4.py b/src/clist/api/v4.py
index c7570207..d386d33b 100644
--- a/src/clist/api/v4.py
+++ b/src/clist/api/v4.py
@@ -69,7 +69,9 @@ class Meta(v3.CoderResource.Meta):
 
 class ProblemResource(BaseModelResource):
     name = fields.CharField('name')
-    contests_ids = fields.ListField('contests_ids')
+    contests_ids = fields.ListField('contests_ids', null=True)
+    divisions = fields.ListField('divisions', null=True)
+    kinds = fields.ListField('kinds', null=True)
     resource = fields.CharField('resource__host',
                                 help_text='Unicode string data. Use comma to filter multiple resources')
     resource_id = fields.IntegerField('resource_id')
diff --git a/src/clist/management/commands/parse_new_problems.py b/src/clist/management/commands/parse_new_problems.py
new file mode 100644
index 00000000..3d14e650
--- /dev/null
+++ b/src/clist/management/commands/parse_new_problems.py
@@ -0,0 +1,113 @@
+#!/usr/bin/env python3
+
+
+import operator
+from collections import defaultdict
+from datetime import timedelta
+from functools import reduce
+from logging import getLogger
+
+from django.core.management.base import BaseCommand
+from django.db.models import Q
+from django.utils import timezone
+from tqdm import tqdm
+
+from clist.models import Problem, Resource
+from utils.attrdict import AttrDict
+
+
+class Command(BaseCommand):
+    help = 'Parsing problems infos'
+
+    def __init__(self, *args, **kw):
+        super(Command, self).__init__(*args, **kw)
+        self.logger = getLogger('clist.parse.new_problems')
+
+    def add_arguments(self, parser):
+        parser.add_argument('-r', '--resources', metavar='HOST', nargs='*', help='host name for update')
+        parser.add_argument('-l', '--limit', default=None, type=int, help='limit problems for one resource')
+
+    def handle(self, *args, **options):
+        self.stdout.write(str(options))
+        args = AttrDict(options)
+
+        if args.resources:
+            filters = [Q(host__startswith=r) | Q(short_host=r) for r in args.resources]
+            resources = Resource.objects.filter(reduce(operator.or_, filters))
+        else:
+            resources = Resource.available_for_update_objects.filter(has_new_problems=True)
+
+        counter = defaultdict(int)
+        for resource in resources:
+            new_problems = resource.plugin.Statistic.get_new_problems(resource=resource, limit=args.limit)
+            problem_keys = [new_problem['key'] for new_problem in new_problems]
+            contest_problems = Problem.objects.filter(resource=resource, key__in=problem_keys)
+            contest_problems = contest_problems.filter(Q(contest__isnull=False) | Q(contests__isnull=False))
+            contest_problem_keys = set(contest_problems.values_list('key', flat=True))
+            problem_time = timezone.now()
+            problem_ids = []
+            for new_problem in tqdm(new_problems):
+                problem_key = new_problem['key']
+                tags = new_problem.get('info', {}).pop('tags', [])
+
+                if problem_key in contest_problem_keys:
+                    problem = Problem.objects.get(resource=resource, key=problem_key)
+                    problem.info.update(new_problem.get('info', {}))
+                    problem.info.pop('total_accepted', None)
+                    problem.info.pop('total_submissions', None)
+                    updated_fields = ['info']
+                    for field in 'n_accepted_submissions', 'n_total_submissions':
+                        if field in new_problem:
+                            setattr(problem, field, new_problem[field])
+                            updated_fields.append(field)
+                    problem.save(update_fields=updated_fields)
+                    if problem.time is not None:
+                        problem_time = problem.time - timedelta(milliseconds=1)
+                    counter['updated'] += 1
+                else:
+                    if 'archive_url' not in new_problem:
+                        new_problem['archive_url'] = resource.problem_url.format(**new_problem)
+                    new_problem['is_archive'] = True
+                    problem, created = Problem.objects.update_or_create(resource=resource,
+                                                                        key=problem_key,
+                                                                        defaults=new_problem)
+                    problem.update_tags(tags, replace=True)
+                    updated_fields = []
+                    if problem.time is None and problem_time:
+                        problem.time = problem_time
+                        updated_fields.append('time')
+
+                    if updated_fields:
+                        problem.save(update_fields=updated_fields)
+
+                    if created:
+                        counter['created'] += 1
+                    counter['done'] += 1
+
+                problem_ids.append(problem.id)
+
+            if resource.problem_rating_predictor:
+                predictor_model = resource.load_problem_rating_predictor()
+                if predictor_model is not None:
+                    rating_changes = []
+                    problems = resource.problem_set.filter(id__in=problem_ids)
+                    problem_filter = resource.problem_rating_predictor['filter']
+                    if problem_filter:
+                        problems = problems.filter(**problem_filter)
+                    df = resource.problem_rating_predictor_data(problems)
+                    df = df.drop(['rating'], axis=1)
+                    ratings = predictor_model.predict(df)
+                    for problem, rating in zip(problems, ratings):
+                        rating = round(rating)
+                        if problem.rating is not None:
+                            rating_changes.append(problem.rating - rating)
+                        if problem.rating != rating:
+                            counter['rating'] += 1
+                            problem.rating = rating
+                            problem.save(update_fields=['rating'])
+                    if rating_changes:
+                        n_rating_changes = len(rating_changes)
+                        self.logger.info(f'Rating change = {sum(rating_changes) / n_rating_changes}')
+                        self.logger.info(f'Rating abs change = {sum(map(abs, rating_changes)) / n_rating_changes}')
+
+        self.logger.info(f'counter = {dict(counter)}')
diff --git a/src/clist/management/commands/parse_problems.py b/src/clist/management/commands/parse_problems.py
index 1ec28512..8dae837e 100644
--- a/src/clist/management/commands/parse_problems.py
+++ b/src/clist/management/commands/parse_problems.py
@@ -23,7 +23,7 @@ class Command(BaseCommand):
 
     def __init__(self, *args, **kw):
         super(Command, self).__init__(*args, **kw)
-        self.logger = getLogger('ranking.parse.problem')
+        self.logger = getLogger('clist.parse.problem')
 
     def add_arguments(self, parser):
         parser.add_argument('-r', '--resources', metavar='HOST', nargs='*', help='host name for update')
@@ -59,22 +59,22 @@ def handle(self, *args, **options):
 
         problems_filter = Q(problem__id__in=problems.values_list('pk', flat=True))
         contests = Contest.objects.annotate(has_problems=Exists('problem_set', filter=problems_filter))
-        contests = contests.filter(Q(has_problems=True))
+        contests = contests.filter(has_problems=True)
         contests = contests.select_related('resource')
         contests = contests.order_by('-end_time')
 
+        modules_cache = dict()
         for contest in tqdm(contests, total=contests.count(), desc='Contests'):
             cache = dict()
-            modules = dict()
             resource = contest.resource
-            if resource not in modules:
-                modules[resource] = resource.plugin.Statistic
-            module = modules[resource]
+            if resource not in modules_cache:
+                modules_cache[resource] = resource.plugin.Statistic
+            plugin_statistic = modules_cache[resource]
 
             problems = deepcopy(contest.info.get('problems'))
             updated = False
             for problem in contest.problems_list:
-                info = module.get_problem_info(problem, contest=contest, cache=cache)
+                info = plugin_statistic.get_problem_info(problem, contest=contest, cache=cache)
                 if info is None:
                     continue
                 problem.update(info)
diff --git a/src/clist/management/commands/set_resources_fields.py b/src/clist/management/commands/set_resources_fields.py
index b7123dcb..f72b9658 100644
--- a/src/clist/management/commands/set_resources_fields.py
+++ b/src/clist/management/commands/set_resources_fields.py
@@ -162,6 +162,7 @@ def __init__(self, *args, **kw):
 
     def add_arguments(self, parser):
         parser.add_argument('-r', '--resources', metavar='HOST', nargs='*', help='host name for update')
+        parser.add_argument('--problems-only', action='store_true', help='update problems only')
 
     def handle(self, *args, **options):
         self.stdout.write(str(options))
@@ -175,7 +176,11 @@ def handle(self, *args, **options):
         else:
             resources = Resource.objects.all()
         self.logger.info(f'resources [{len(resources)}] = {[r.host for r in resources]}')
-        set_accounts_fields(resources, logger=self.logger)
-        set_problems_fields(resources, logger=self.logger)
-        set_statistics_fields(resources, logger=self.logger)
-        set_n_fields(resources, logger=self.logger)
+
+        if args.problems_only:
+            set_problems_fields(resources, logger=self.logger)
+        else:
+            set_accounts_fields(resources, logger=self.logger)
+            set_problems_fields(resources, logger=self.logger)
+            set_statistics_fields(resources, logger=self.logger)
+            set_n_fields(resources, logger=self.logger)
diff --git a/src/clist/management/commands/train_problem_rating_predictor.py b/src/clist/management/commands/train_problem_rating_predictor.py
new file mode 100644
index 00000000..aaf7d9ce
--- /dev/null
+++ b/src/clist/management/commands/train_problem_rating_predictor.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+
+
+import operator
+from functools import reduce
+from logging import getLogger
+
+from django.core.management.base import BaseCommand
+from django.db.models import Q
+from sklearn.model_selection import RandomizedSearchCV
+
+from clist.models import Resource
+from utils.attrdict import AttrDict
+
+
+class Command(BaseCommand):
+    help = 'Train problem rating predictor'
+
+    def __init__(self, *args, **kw):
+        super(Command, self).__init__(*args, **kw)
+        self.logger = getLogger('clist.train.problem_rating_predictor')
+
+    def add_arguments(self, parser):
+        parser.add_argument('-r', '--resources', metavar='HOST', nargs='*', help='host name for update', required=True)
+        parser.add_argument('-n', '--n-iters', type=int, default=100, help='number of iterations for search cv')
+
+    def handle(self, *args, **options):
+        self.stdout.write(str(options))
+        args = AttrDict(options)
+
+        resources = Resource.objects.exclude(problem_rating_predictor__exact={})
+        filters = [Q(host__startswith=r) | Q(short_host=r) for r in args.resources]
+        resources = resources.filter(reduce(operator.or_, filters))
+
+        for resource in resources:
+            problems = resource.problem_set.filter(rating__isnull=False)
+            problem_filter = resource.problem_rating_predictor['filter']
+            if problem_filter:
+                problems = problems.exclude(**problem_filter)
+
+            df = resource.problem_rating_predictor_data(problems)
+            X = df.drop(['rating'], axis=1)
+            y = df['rating']
+
+            predictor_model, param_distributions = resource.problem_rating_predictor_model()
+            random_search = RandomizedSearchCV(estimator=predictor_model, param_distributions=param_distributions,
+                                               n_iter=args.n_iters, scoring='neg_root_mean_squared_error', cv=5,
+                                               verbose=1, n_jobs=-1, error_score='raise')
+            random_search.fit(X, y)
+            self.logger.info(f'Best params: {random_search.best_params_}')
+            self.logger.info(f'Best RMSE: {-random_search.best_score_}')
+
+            resource.save_problem_rating_predictor(random_search.best_estimator_)
diff --git a/src/clist/migrations/0160_problem_kinds.py b/src/clist/migrations/0160_problem_kinds.py
new file mode 100644
index 00000000..3a00c050
--- /dev/null
+++ b/src/clist/migrations/0160_problem_kinds.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0.7 on 2024-07-28 12:11
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('clist', '0159_update_problem'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='problem',
+            name='kinds',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), blank=True, default=None, null=True, size=None),
+        ),
+    ]
diff --git a/src/clist/migrations/0161_auto_20240728_1215.py b/src/clist/migrations/0161_auto_20240728_1215.py
new file mode 100644
index 00000000..b55d4566
--- /dev/null
+++ b/src/clist/migrations/0161_auto_20240728_1215.py
@@ -0,0 +1,37 @@
+# Generated by Django 5.0.7 on 2024-07-28 12:15
+
+import tqdm
+from django.db import migrations
+from django.db.models import Q
+
+
+def set_problem_kinds(apps, schema_editor):
+    Contest = apps.get_model('clist', 'Contest')
+    Problem = apps.get_model('clist', 'Problem')
+
+    contests = Contest.objects.filter(kind__isnull=False)
+    qs = Problem.objects.filter(Q(contest__in=contests) | Q(contests__in=contests))
+    qs = qs.prefetch_related('contests')
+    qs = qs.select_related('contest')
+
+    for problem in tqdm.tqdm(qs, total=qs.count()):
+        kinds = []
+        cs = list(problem.contests.all())
+        if problem.contest:
+            cs.append(problem.contest)
+        for c in cs:
+            if c.kind and c.kind not in kinds:
+                kinds.append(c.kind)
+        problem.kinds = kinds
+        problem.save(update_fields=['kinds'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('clist', '0160_problem_kinds'),
+    ]
+
+    operations = [
+        migrations.RunPython(set_problem_kinds),
+    ]
diff --git a/src/clist/migrations/0162_resource_edits.py b/src/clist/migrations/0162_resource_edits.py
new file mode 100644
index 00000000..89081716
--- /dev/null
+++ b/src/clist/migrations/0162_resource_edits.py
@@ -0,0 +1,89 @@
+# Generated by Django 5.0.7 on 2024-08-11 22:26
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    replaces = [('clist', '0162_resource_has_new_problems'), ('clist', '0163_alter_problem_end_time_alter_problem_start_time_and_more'), ('clist', '0164_problem_from_archive_problem_from_contest'), ('clist', '0165_rename_from_archive_problem_is_archive_and_more'), ('clist', '0166_problem_n_accepted_submissions_and_more'), ('clist', '0167_rename_n_total_submussions_problem_n_total_submissions'), ('clist', '0168_resource_problem_rating_predictor'), ('clist', '0169_alter_problem_kinds_and_more'), ('clist', '0170_alter_problem_divisions_alter_problem_kinds_and_more'), ('clist', '0171_alter_problem_divisions_alter_problem_kinds')]
+
+    dependencies = [
+        ('clist', '0161_auto_20240728_1215'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='resource',
+            name='has_new_problems',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='problem',
+            name='end_time',
+            field=models.DateTimeField(blank=True, default=None, null=True),
+        ),
+        migrations.AlterField(
+            model_name='problem',
+            name='start_time',
+            field=models.DateTimeField(blank=True, default=None, null=True),
+        ),
+        migrations.AlterField(
+            model_name='problem',
+            name='time',
+            field=models.DateTimeField(blank=True, default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='problem',
+            name='is_archive',
+            field=models.BooleanField(blank=True, default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='problem',
+            name='n_accepted_submissions',
+            field=models.IntegerField(blank=True, default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='problem',
+            name='n_total_submissions',
+            field=models.IntegerField(blank=True, default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='resource',
+            name='problem_rating_predictor',
+            field=models.JSONField(blank=True, default=dict),
+        ),
+        migrations.AlterField(
+            model_name='problem',
+            name='kinds',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), blank=True, db_index=True, default=None, null=True, size=None),
+        ),
+        migrations.AddIndex(
+            model_name='problem',
+            index=models.Index(fields=['resource_id', 'kinds'], name='clist_probl_resourc_b7c8f6_idx'),
+        ),
+        migrations.AlterField(
+            model_name='problem',
+            name='divisions',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), blank=True, db_index=True, default=[], size=None),
+        ),
+        migrations.AlterField(
+            model_name='problem',
+            name='kinds',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), blank=True, db_index=True, default=[], size=None),
+        ),
+        migrations.AddIndex(
+            model_name='problem',
+            index=models.Index(fields=['resource_id', 'divisions'], name='clist_probl_resourc_bc6b00_idx'),
+        ),
+        migrations.AlterField(
+            model_name='problem',
+            name='divisions',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), blank=True, db_index=True, default=list, size=None),
+        ),
+        migrations.AlterField(
+            model_name='problem',
+            name='kinds',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), blank=True, db_index=True, default=list, size=None),
+        ),
+    ]
diff --git a/src/clist/models.py b/src/clist/models.py
index 6314126c..7bbfe3c6 100644
--- a/src/clist/models.py
+++ b/src/clist/models.py
@@ -10,7 +10,9 @@
 from urllib.parse import urljoin, urlparse
 
 import numpy as np
+import pandas as pd
 import requests
+import xgboost as xgb
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericRelation
 from django.contrib.postgres.fields import ArrayField
@@ -22,6 +24,7 @@
 from django.utils.timezone import now as timezone_now
 from django_ltree.fields import PathField
 from PIL import Image, UnidentifiedImageError
+from scipy.stats import randint, uniform
 
 from clist.templatetags.extras import get_item, get_problem_key, slug
 from logify.models import EventLog, EventStatus
@@ -88,6 +91,7 @@ class Resource(BaseModel):
     contest_update_time = models.DateTimeField(null=True, blank=True)
     has_problem_rating = models.BooleanField(default=False)
     has_problem_update = models.BooleanField(default=False)
+    has_new_problems = models.BooleanField(default=False)
     has_multi_account = models.BooleanField(default=False)
     has_accounts_infos_update = models.BooleanField(default=False)
     n_accounts_to_update = models.IntegerField(default=None, null=True, blank=True)
@@ -103,6 +107,7 @@ class Resource(BaseModel):
     problems_fields = models.JSONField(default=dict, blank=True)
     statistics_fields = models.JSONField(default=dict, blank=True)
     skip_for_contests_chart = models.BooleanField(default=False)
+    problem_rating_predictor = models.JSONField(default=dict, blank=True)
 
     RATING_FIELDS = (
         'old_rating', 'new_rating', 'rating', 'rating_perf', 'performance', 'raw_rating',
@@ -308,7 +313,7 @@ def is_major_kind(self, instance):
         if not instance:
             return True
         if isinstance(instance, str):
-            return instance == self.info.get('major_kind')
+            return instance in self.info.get('major_kinds', [])
         if isinstance(instance, Contest):
             return self.is_major_kind(instance.kind)
         if isinstance(instance, Iterable):
@@ -316,8 +321,8 @@ def is_major_kind(self, instance):
         raise ValueError(f'Invalid instance type = {type(instance)}')
 
     def major_contests(self):
-        major_kind = self.info.get('major_kind')
-        return self.contest_set.filter(Q(kind=major_kind) | Q(kind__isnull=True) | Q(kind=''))
+        major_kinds = self.info.get('major_kinds', [])
+        return self.contest_set.filter(Q(kind__in=major_kinds) | Q(kind__isnull=True) | Q(kind=''))
 
     def rating_step(self):
         prev = 0
@@ -339,6 +344,50 @@ def get_object(cls, value):
         condition = Q(pk=value) if value.isdigit() else Q(host__contains=value)
         return Resource.objects.get(condition)
 
+    def problem_rating_predictor_features(self, problem):
+        feature_fields = self.problem_rating_predictor['fields']
+        problem_data = dict()
+        problem_data.update(problem.__dict__)
+        problem_data.update(problem.info)
+        features = {}
+        for field_data in feature_fields:
+            field = field_data['field']
+            value = problem_data.get(field)
+            if field_data.get('mapping'):
+                value = field_data['mapping'][value]
+            if isinstance(value, bool):
+                value = int(value)
+            features[field] = value
+        features['rating'] = problem.rating
+        return features
+
+    def problem_rating_predictor_data(self, problems):
+        data = [self.problem_rating_predictor_features(problem) for problem in problems]
+        df = pd.DataFrame(data)
+        return df
+
+    def problem_rating_predictor_model(self):
+        param_distributions = {
+            'learning_rate': uniform(0.01, 0.3),
+            'max_depth': randint(3, 8),
+        }
+        return xgb.XGBRegressor(), param_distributions
+
+    def save_problem_rating_predictor(self, model):
+        model_path = os.path.join(settings.SHARED_DIR, self.problem_rating_predictor['path'])
+        model_folder = os.path.dirname(model_path)
+        if not os.path.exists(model_folder):
+            os.makedirs(model_folder, exist_ok=True)
+        model.save_model(model_path)
+
+    def load_problem_rating_predictor(self):
+        model_path = os.path.join(settings.SHARED_DIR, self.problem_rating_predictor['path'])
+        if not os.path.exists(model_path):
+            return None
+        model, _ = self.problem_rating_predictor_model()
+        model.load_model(model_path)
+        return model
+
 
 class BaseContestManager(BaseManager):
     pass
@@ -676,6 +725,11 @@ def actual_url(self):
     def is_major_kind(self):
         return self.resource.is_major_kind(self.kind)
 
+    def shown_kind(self):
+        if not self.kind or self.kind == 'stage' or self.is_major_kind():
+            return None
+        return self.kind
+
     @property
     def standings_start_time(self):
         start_time = self.info.get('custom_start_time')
@@ -832,9 +886,9 @@ class Problem(BaseModel):
                                 related_name='individual_problem_set')
     contests = models.ManyToManyField(Contest, blank=True, related_name='problem_set')
     resource = models.ForeignKey(Resource, on_delete=models.CASCADE)
-    time = models.DateTimeField()
-    start_time = models.DateTimeField()
-    end_time = models.DateTimeField()
+    time = models.DateTimeField(default=None, null=True, blank=True)
+    start_time = models.DateTimeField(default=None, null=True, blank=True)
+    end_time = models.DateTimeField(default=None, null=True, blank=True)
     index = models.SmallIntegerField(null=True)
     key = models.TextField()
     name = models.TextField()
@@ -842,15 +896,19 @@ class Problem(BaseModel):
     short = models.TextField(default=None, null=True, blank=True)
     url = models.TextField(default=None, null=True, blank=True)
     archive_url = models.TextField(default=None, null=True, blank=True)
-    divisions = ArrayField(models.TextField(), default=None, null=True, blank=True)
+    divisions = ArrayField(models.TextField(), default=list, blank=True, db_index=True)
+    kinds = ArrayField(models.CharField(max_length=30), default=list, blank=True, db_index=True)
     n_attempts = models.IntegerField(default=None, null=True, blank=True)
     n_accepted = models.IntegerField(default=None, null=True, blank=True)
     n_partial = models.IntegerField(default=None, null=True, blank=True)
     n_hidden = models.IntegerField(default=None, null=True, blank=True)
     n_total = models.IntegerField(default=None, null=True, blank=True)
+    n_accepted_submissions = models.IntegerField(default=None, null=True, blank=True)
+    n_total_submissions = models.IntegerField(default=None, null=True, blank=True)
     visible = models.BooleanField(default=True, null=False)
     rating = models.IntegerField(default=None, null=True, blank=True, db_index=True)
     skip_rating = models.BooleanField(default=None, null=True, blank=True)
+    is_archive = models.BooleanField(default=None, null=True, blank=True)
     info = models.JSONField(default=dict, blank=True)
 
     activities = GenericRelation('favorites.Activity', related_query_name='problem')
@@ -870,6 +928,8 @@ class Meta:
             models.Index(fields=['-time', 'contest_id', 'index']),
             models.Index(fields=['resource_id', 'rating']),
             models.Index(fields=['resource_id', 'key']),
+            models.Index(fields=['resource_id', 'divisions']),
+            models.Index(fields=['resource_id', 'kinds']),
             GistIndexTrgrmOps(fields=['name']),
         ]
 
@@ -923,6 +983,24 @@ def cached_get(contest, short) -> Optional['Problem']:
         except Problem.DoesNotExist:
             return None
 
+    def update_tags(self, tags, replace):
+        if not tags:
+            return
+
+        old_tags = set(self.tags.all())
+        for name in tags:
+            if not name:
+                continue
+            tag, _ = ProblemTag.objects.get_or_create(name=name)
+            if tag in old_tags:
+                old_tags.discard(tag)
+            else:
+                self.tags.add(tag)
+
+        if replace:
+            for tag in old_tags:
+                self.tags.remove(tag)
+
 
 class ProblemTag(BaseModel):
     name = models.TextField(unique=True, db_index=True, null=False)
diff --git a/src/clist/templatetags/extras.py b/src/clist/templatetags/extras.py
index 6c14e59c..3cff744c 100644
--- a/src/clist/templatetags/extras.py
+++ b/src/clist/templatetags/extras.py
@@ -1422,6 +1422,20 @@ def to_rating_change_field(field):
     return field.replace('new_rating', 'rating_change')
 
 
+@register.simple_tag
+def rating_change_template(value):
+    if not isinstance(value, (float, int)):
+        value = as_number(value, force=True)
+    if not value:
+        span_class = 'rating-change-same'
+    elif value > 0:
+        span_class = 'rating-change-up'
+    else:
+        span_class = 'rating-change-down'
+    ret = f'<span class="rating-change {span_class}">{icon_to(span_class)}{abs(value)}</span>'
+    return mark_safe(ret)
+
+
 @register.simple_tag
 def queryset_filter(qs, **kwargs):
     return qs.filter(**kwargs)
@@ -1596,3 +1610,15 @@ def filtered_admin_url(url, field_selects):
 @register.filter
 def camel_to_snake(value):
     return re.sub(r'(?<!^)(?=[A-Z])', '_', value).lower()
+
+
+@register.simple_tag
+def label_tag(label, status=None):
+    label = html.escape(label)
+    status = status or 'info'
+    return mark_safe(f'<span class="label label-sm alert-{status} label-tag">{label}</span>')
+
+
+@register.filter
+def is_major_kind(resource, value):
+    return resource.is_major_kind(value)
diff --git a/src/clist/views.py b/src/clist/views.py
index 23cda189..0bc34bf2 100644
--- a/src/clist/views.py
+++ b/src/clist/views.py
@@ -355,7 +355,8 @@ def resources(request):
         'resources': resources,
         'params': {
             'more_fields': more_fields,
-        }
+        },
+        'navbar_database_viewname': 'clist_resource_changelist',
     }
     return render(request, 'resources.html', context)
 
@@ -831,12 +832,21 @@ def update_problems(contest, problems=None, force=False):
 
                 skip_rating = bool(contest.info.get('skip_problem_rating'))
 
+                kinds = getattr(added_problem, 'kinds', [])
+                if contest.kind and contest.kind not in kinds:
+                    kinds.append(contest.kind)
+
+                divisions = getattr(added_problem, 'divisions', [])
+                if division and division not in divisions:
+                    divisions.append(division)
+
                 defaults = {
                     'index': index if getattr(added_problem, 'index', index) == index else None,
                     'short': short if getattr(added_problem, 'short', short) == short else None,
                     'name': name,
                     'slug': info.pop('slug', getattr(added_problem, 'slug', None)),
-                    'divisions': getattr(added_problem, 'divisions', []) + ([division] if division else []),
+                    'divisions': divisions,
+                    'kinds': kinds,
                     'url': url,
                     'n_attempts': info.pop('n_teams', 0) + getattr(added_problem, 'n_attempts', 0),
                     'n_accepted': info.pop('n_accepted', 0) + getattr(added_problem, 'n_accepted', 0),
@@ -848,6 +858,11 @@ def update_problems(contest, problems=None, force=False):
                     'end_time': max(contest.end_time, getattr(added_problem, 'end_time', contest.end_time)),
                     'skip_rating': skip_rating and getattr(added_problem, 'skip_rating', skip_rating),
                 }
+                for optional_field in 'n_accepted_submissions', 'n_total_submissions':
+                    if optional_field not in info:
+                        continue
+                    added_value = getattr(added_problem, optional_field, 0) or 0
+                    defaults[optional_field] = info.pop(optional_field) + added_value
                 if getattr(added_problem, 'rating', None) is not None:
                     problem_info['rating'] = added_problem.rating
                     info.pop('rating', None)
@@ -889,19 +904,7 @@ def update_problems(contest, problems=None, force=False):
                 )
                 problem.contests.add(contest)
 
-                old_tags = set(problem.tags.all())
-                if 'tags' in problem_info:
-                    if '' in problem_info['tags']:
-                        problem_info['tags'].remove('')
-                    for name in problem_info['tags']:
-                        tag, _ = ProblemTag.objects.get_or_create(name=name)
-                        if tag in old_tags:
-                            old_tags.discard(tag)
-                        else:
-                            problem.tags.add(tag)
-                if not added_problem:
-                    for tag in old_tags:
-                        problem.tags.remove(tag)
+                problem.update_tags(problem_info.get('tags'), replace=not added_problem)
 
                 added_problems[key] = problem
 
@@ -969,7 +972,7 @@ def problems(request, template='problems.html'):
     problems = problems.prefetch_related('tags')
     problems = problems.annotate(min_contest_id=SubqueryMin('contests__id'))
     problems = problems.annotate(date=F('time'))
-    problems = problems.order_by('-time', '-min_contest_id', 'rating', 'index', 'short')
+    problems = problems.order_by(F('time').desc(nulls_last=True), '-min_contest_id', 'rating', 'index', 'short')
 
     show_tags = True
     if request.user.is_authenticated:
@@ -1037,6 +1040,7 @@ def problems(request, template='problems.html'):
                 'n_partial':  {'fields': ['n_partial']},
                 'n_hidden':  {'fields': ['n_hidden']},
                 'n_total':  {'fields': ['n_total']},
+                'archive': {'fields': ['is_archive'], 'func': lambda v: v in settings.YES_},
                 'note': {'fields': ['note_text__iregex']},
                 'year': {'fields': ['time__year']},
             },
@@ -1107,10 +1111,13 @@ def problems(request, template='problems.html'):
         tags = list(ProblemTag.objects.filter(pk__in=tags))
 
     custom_fields = [f for f in request.GET.getlist('field') if f]
-    custom_options = ['name', 'index', 'short', 'key', 'slug', 'url', 'archive_url', 'divisions',
-                      'n_accepted', 'n_attempts', 'n_partial', 'n_hidden', 'n_total']
+    custom_options = ['name', 'index', 'short', 'key', 'slug', 'url', 'archive_url', 'divisions', 'kinds',
+                      'n_accepted', 'n_attempts', 'n_partial', 'n_hidden', 'n_total',
+                      'n_accepted_submissions', 'n_total_submissions']
     custom_info_fields = set()
     if selected_resource:
+        if selected_resource.has_new_problems:
+            custom_options.append('is_archive')
         fixed_fields = selected_resource.problems_fields.get('fixed_fields', [])
         custom_fields = custom_fields + fixed_fields
         fixed_fields_set = set(fixed_fields)
@@ -1279,8 +1286,10 @@ def problems(request, template='problems.html'):
         'groupby_data': groupby_data,
         'groupby_fields': groupby_fields,
         'groupby_select_first_column': True,
+        'selected_resource': selected_resource,
         'per_page': 50,
         'per_page_more': 200,
+        'navbar_database_viewname': 'clist_problem_changelist',
     }
 
     return template, context
diff --git a/src/pyclist/settings.py b/src/pyclist/settings.py
index 728a603a..0a42712a 100644
--- a/src/pyclist/settings.py
+++ b/src/pyclist/settings.py
@@ -31,6 +31,7 @@
 
 # Build paths inside the project like this: path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+SHARED_DIR = os.path.join(BASE_DIR, 'sharedfiles')
 
 env = Env()
 env.read_env(env('DJANGO_ENV_FILE'))
@@ -755,6 +756,10 @@ def show_toolbar_callback(request):
     'unfreezing': '<i class="fa-regular fa-snowflake"></i>',
     'exclamation': '<i class="fa-solid fa-circle-exclamation"></i>',
     'close': '<i class="fa-solid fa-xmark"></i>',
+    'locked': '<i class="fa-solid fa-lock"></i>',
+    'rating-change-up': dict(icon='<i class="fas fa-angle-up"></i>', title=False),
+    'rating-change-down': dict(icon='<i class="fas fa-angle-down"></i>', title=False),
+    'rating-change-same': dict(icon='<i class="fa-solid fa-equals fa-2xs"></i>', title=False),
 
     'google': {'icon': '<i class="fab fa-google"></i>', 'title': None},
     'facebook': {'icon': '<i class="fab fa-facebook"></i>', 'title': None},
@@ -780,7 +785,7 @@ def show_toolbar_callback(request):
 
 UPSOLVING_FILTER_DEFAULT = True
 
-GEOIP_PATH = os.path.join(BASE_DIR, 'sharedfiles', 'GeoLite2-Country.mmdb')
+GEOIP_PATH = os.path.join(SHARED_DIR, 'GeoLite2-Country.mmdb')
 GEOIP_ACCOUNT_ID = getattr(conf, 'GEOIP_ACCOUNT_ID')
 GEOIP_LICENSE_KEY = getattr(conf, 'GEOIP_LICENSE_KEY')
 
diff --git a/src/ranking/management/commands/parse_accounts_infos.py b/src/ranking/management/commands/parse_accounts_infos.py
index f26c5afa..cd844eee 100644
--- a/src/ranking/management/commands/parse_accounts_infos.py
+++ b/src/ranking/management/commands/parse_accounts_infos.py
@@ -312,7 +312,7 @@ def inf_none():
             else:
                 event_log.update_status(EventStatus.COMPLETED, message=message)
 
-            if exception_error and regular_update:
+            if regular_update:
                 try:
                     updated = arrow.get(now + timedelta(days=1)).ceil('day').datetime
                     for a in tqdm(accounts, desc='changing update time'):
diff --git a/src/ranking/management/commands/parse_statistic.py b/src/ranking/management/commands/parse_statistic.py
index 8bf3b03b..b07e0b41 100644
--- a/src/ranking/management/commands/parse_statistic.py
+++ b/src/ranking/management/commands/parse_statistic.py
@@ -356,6 +356,7 @@ def parse_statistic(
         )
 
         processed_group = set()
+        error_counter = defaultdict(int)
         for contest in progress_bar:
             if stop_on_error and has_error:
                 break
@@ -412,8 +413,6 @@ def parse_statistic(
             contest_log_counter = defaultdict(int)
 
             try:
-                r = {}
-
                 now = timezone_now()
                 is_coming = now < contest.start_time
                 plugin = resource.plugin.Statistic(contest=contest)
@@ -1652,8 +1651,8 @@ def set_matched_coders_to_members(statistic):
                 progress_bar.set_postfix(exception=str(e), cid=str(contest.pk))
             except Exception as e:
                 exception_error = str(e)
+                error_counter[str(e)] += 1
                 self.logger.debug(colored_format_exc())
-                self.logger.warning(f'contest = {contest}, row = {r}')
                 self.logger.error(f'parse_statistic exception: {e}')
                 has_error = True
                 if stop_on_error:
@@ -1699,6 +1698,8 @@ def set_matched_coders_to_members(statistic):
             if users:
                 event_log.delete()
             self.logger.info(f'log_counter = {dict(contest_log_counter)}')
+            if error_counter:
+                self.logger.info(f'error_counter = {dict(error_counter)}')
             channel_layer_handler.send_done(done=parsed)
 
         @lru_cache(maxsize=None)
@@ -1763,6 +1764,7 @@ def handle(self, *args, **options):
         if args.only_new:
             has_statistics = Statistics.objects.filter(contest_id=OuterRef('pk'))
             contests = contests.annotate(has_statistics=Exists(has_statistics)).filter(has_statistics=False)
+            contests = contests.filter(Q(n_problems__isnull=True) | Q(n_problems=0))
 
         if args.year:
             contests = contests.filter(start_time__year=args.year)
diff --git a/src/ranking/management/modules/ac_nowcoder.py b/src/ranking/management/modules/ac_nowcoder.py
new file mode 100644
index 00000000..7e3c673f
--- /dev/null
+++ b/src/ranking/management/modules/ac_nowcoder.py
@@ -0,0 +1,229 @@
+#!/usr/bin/env python3
+
+import re
+from collections import OrderedDict
+from concurrent.futures import ThreadPoolExecutor as PoolExecutor
+
+import tqdm
+from django.utils import timezone
+from ratelimiter import RateLimiter
+
+from clist.templatetags.extras import as_number, normalize_field
+from ranking.management.modules.common import REQ, BaseModule
+from ranking.management.modules.excepts import ExceptionParseAccounts, ExceptionParseStandings
+
+
+class Statistic(BaseModule):
+    API_STANDING_URL_FORMAT_ = '{0.host}acm-heavy/acm/contest/real-time-rank-data?id={0.key}'
+    API_PROBLEM_URL_FORMAT_ = '{0.host}acm/contest/problem-list?&id={0.key}'
+    API_RATING_HISTORY_URL_FORMAT_ = '{0}acm-heavy/acm/contest/rating-history?uid={1}'
+
+    def get_standings(self, users=None, statistics=None, **kwargs):
+        standings_url = f'{self.url}#rank'
+        api_standings_url = self.API_STANDING_URL_FORMAT_.format(self)
+        timestamp = int(timezone.now().timestamp() * 1000)
+
+        problem_infos = []
+
+        api_problem_url = self.API_PROBLEM_URL_FORMAT_.format(self)
+        page = 1
+        data = None
+        while data is None or page < data['basicInfo']['pageCount']:
+            url = f'{api_problem_url}&page={page}&_={timestamp}'
+            data = REQ.get(url, return_json=True)
+            data = data['data']
+            for problem in data['data']:
+                problem_info = dict(
+                    short=problem['index'],
+                    name=problem['title'],
+                    code=problem['problemId'],
+                    accepted_count=problem['acceptedCount'],
+                    submit_count=problem['submitCount'],
+                    url=f'{self.url}/{problem["index"]}',
+                )
+
+                if self.contest.standings_kind == 'scoring':
+                    problem_info['full_score'] = problem['score']
+                problem_infos.append(problem_info)
+            page += 1
+
+        result = OrderedDict()
+        hidden_fields = set()
+
+        def fetch_page(page):
+            url = f'{api_standings_url}&page={page}&limit=0&_={timestamp}'
+            data = REQ.get(url, return_json=True)
+            return data['data']
+
+        def process_page(data):
+            rank_data = data['rankData']
+            for row in rank_data:
+                score_list = row.pop('scoreList')
+                handle = str(row.pop('uid'))
+                res = result.setdefault(handle, OrderedDict())
+                res['member'] = handle
+                res['place'] = row.pop('ranking')
+                res['name'] = row.pop('userName')
+
+                penalty = row.pop('penaltyTime') / 1000
+
+                accepted_count = row.pop('acceptedCount')
+                res['solved'] = {'solving': accepted_count}
+
+                if self.contest.standings_kind == 'icpc':
+                    res['solving'] = accepted_count
+                    penalty /= 60
+                    penalty_num = 1
+                elif self.contest.standings_kind == 'scoring':
+                    res['solving'] = row.pop('totalScore')
+                    penalty_num = 3
+                else:
+                    raise ExceptionParseStandings('Unknown standings kind')
+
+                res['penalty'] = self.to_time(penalty, num=penalty_num)
+
+                res['is_team'] = row.pop('team')
+                hidden_fields.add('is_team')
+
+                for k, v in row.items():
+                    k = normalize_field(k)
+                    if k not in res:
+                        hidden_fields.add(k)
+                        res[k] = v
+
+                problems = res.setdefault('problems', {})
+                for problem_info, score in zip(problem_infos, score_list):
+                    if not score.pop('submit'):
+                        continue
+                    accepted_time = score.pop('acceptedTime') // 1000
+                    penalty = accepted_time - self.contest.start_time.timestamp()
+                    short = problem_info['short']
+                    p = problems.setdefault(short, {})
+
+                    is_accepted = score.pop('accepted')
+                    attempts = score.pop('failedCount')
+
+                    if is_accepted:
+                        p['time_in_seconds'] = penalty
+
+                    if self.contest.standings_kind == 'icpc':
+                        p['result'] = '+' if is_accepted else '-'
+                        if attempts:
+                            p['result'] += str(attempts)
+                        penalty /= 60
+                    elif self.contest.standings_kind == 'scoring':
+                        p['result'] = score.pop('score')
+                        if not is_accepted:
+                            p['partial'] = True
+
+                    if is_accepted:
+                        p['time'] = self.to_time(penalty, num=penalty_num, short=True)
+
+                    first_ac = score.pop('firstBlood')
+                    if first_ac:
+                        p['first_ac'] = True
+
+                    for k in 'submissionId', 'timeConsumption':
+                        v = score.pop(k)
+                        if v:
+                            p[normalize_field(k)] = v
+                if not problems:
+                    result.pop(handle)
+
+        data = fetch_page(1)
+        process_page(data)
+
+        n_pages = data['basicInfo']['pageCount']
+        for page in tqdm.trange(2, n_pages + 1, desc='fetch pages'):
+            data = fetch_page(page)
+            process_page(data)
+
+        ret = {
+            'url': standings_url,
+            'problems': problem_infos,
+            'hidden_fields': list(hidden_fields),
+            'result': result,
+        }
+        return ret
+
+    @staticmethod
+    def get_users_infos(users, resource, accounts, pbar=None):
+        timestamp = int(timezone.now().timestamp() * 1000)
+
+        @RateLimiter(max_calls=2, period=1)
+        def fetch_profile(account):
+            ret = {'handle': account.key}
+
+            url = Statistic.API_RATING_HISTORY_URL_FORMAT_.format(resource.href(), account.key)
+            url = f'{url}&_={timestamp}'
+            data = REQ.get(url, return_json=True)
+            if not isinstance(data, dict) or 'data' not in data:
+                return False
+            ret['ratings'] = data['data']
+
+            profile_url = account.profile_url(resource)
+            page, last_url = REQ.get(profile_url, return_url=True)
+            if account.key not in last_url:
+                return None
+
+            mapping = {'Rating排名': 'rank'}
+            matches = re.finditer(r'<[^>]*state-num[^>]*>(?P<value>[^<]*)</[^>]*>\s*<[^>]*>(?P<key>[^<]*)</[^>]*>', page)  # noqa: E501
+            for match in matches:
+                key = match.group('key')
+                if key not in mapping:
+                    continue
+                value = match.group('value')
+                ret[mapping[key]] = as_number(value)
+            if 'rank' in ret and not isinstance(ret['rank'], int):
+                ret['rank_str'] = ret.pop('rank')
+            return ret
+
+        balance = 10
+        with PoolExecutor(max_workers=4) as executor:
+            futures = [executor.submit(fetch_profile, account) for account in accounts]
+            for user, future in zip(users, futures):
+                if pbar:
+                    pbar.update()
+
+                try:
+                    data = future.result()
+                except Exception:
+                    data = False
+
+                if not data:
+                    if data is None:
+                        yield {'delete': True}
+                    else:
+                        balance //= 2
+                        if balance == 0:
+                            break
+                        yield {'skip': True}
+                    continue
+                balance += 1
+
+                if data.pop('handle') != user:
+                    raise ExceptionParseAccounts('Handle is not same')
+
+                ret = dict(info=data)
+                contest_addition_update = {}
+                ratings = data.pop('ratings')
+                ratings.sort(key=lambda x: x['time'])
+                for rating in ratings:
+                    contest_id = str(rating['contestId'])
+                    update = contest_addition_update.setdefault(contest_id, OrderedDict())
+                    update['_rank'] = rating['rank']
+                    update['new_rating'] = round(rating['rating'])
+                    update['rating_change'] = round(rating['changeValue'])
+                    update['old_rating'] = update['new_rating'] - update['rating_change']
+                    data['rating'] = update['new_rating']
+
+                if contest_addition_update:
+                    ret['contest_addition_update_params'] = dict(
+                        update=contest_addition_update,
+                        clear_rating_change=True,
+                    )
+
+                yield ret
+
+            for future in futures:
+                future.cancel()
diff --git a/src/ranking/management/modules/beecrowd.py b/src/ranking/management/modules/beecrowd.py
index 156a964a..66f83e4b 100644
--- a/src/ranking/management/modules/beecrowd.py
+++ b/src/ranking/management/modules/beecrowd.py
@@ -1,19 +1,35 @@
 #!/usr/bin/env python3
 
+import os
 import re
 from collections import OrderedDict
 
 from clist.templatetags.extras import as_number
-from ranking.management.modules.common import REQ, BaseModule, parsed_table
+from ranking.management.modules.common import REQ, BaseModule, FailOnGetResponse, parsed_table
 
 
 class Statistic(BaseModule):
-    STANDING_URL_FORMAT_ = '{0.host}judge/en/users/contest/{0.key}'
+    STANDING_URL_FORMAT_ = '{0.host}en/users/contest/{0.key}'
 
     def get_standings(self, users=None, statistics=None, **kwargs):
         standings_url = self.STANDING_URL_FORMAT_.format(self)
 
-        page = REQ.get(standings_url)
+        headers = dict()
+        user_agent = 'logs/legacy/beecrowd.user_agent'
+        if os.path.exists(user_agent):
+            with open(user_agent) as fo:
+                headers['User-Agent'] = fo.read().strip()
+        curl_cookie_file = 'logs/legacy/beecrowd.cookie'
+        if not os.path.exists(curl_cookie_file):
+            curl_cookie_file = None
+
+        try:
+            page = REQ.get(standings_url, headers=headers, with_curl=True, curl_cookie_file=curl_cookie_file)
+        except FailOnGetResponse as e:
+            if e.code == 404 and self.contest.is_over():
+                return {'action': 'delete'}
+            raise
+
         page = page.replace('&bullet;', '')
         table = parsed_table.ParsedTable(page, xpath='//table[@id="contest-rank"]//tr')
         problems_infos = OrderedDict()
diff --git a/src/ranking/management/modules/codechef.py b/src/ranking/management/modules/codechef.py
index 9ad93072..55b1aa96 100644
--- a/src/ranking/management/modules/codechef.py
+++ b/src/ranking/management/modules/codechef.py
@@ -8,7 +8,6 @@
 import time
 import traceback
 from collections import OrderedDict, defaultdict
-from concurrent.futures import ThreadPoolExecutor as PoolExecutor
 from copy import deepcopy
 from datetime import timedelta
 from urllib.parse import quote, urljoin
@@ -58,6 +57,14 @@ def _get_headers_with_csrf_token(key):
                 csrf_token = match.group(1)
                 return {'x-csrf-token': csrf_token, 'x-requested-with': 'XMLHttpRequest'}
 
+    @RateLimiter(max_calls=1, period=6)
+    @staticmethod
+    def _get(*args, **kwargs):
+        additional_attempts = kwargs.setdefault('additional_attempts', {})
+        additional_attempts[429] = {'count': 5}
+        kwargs['additional_delay'] = 10
+        return REQ.get(*args, **kwargs)
+
     def get_standings(self, users=None, statistics=None, **kwargs):
         # REQ.get('https://www.codechef.com/')
 
@@ -137,7 +144,7 @@ def get_standings(self, users=None, statistics=None, **kwargs):
                             break
                         except Exception:
                             traceback.print_exc()
-                            delay = min(300, delay * 2)
+                            delay = min(100, delay * 2)
                             sys.stdout.write(f'url = {url}\n')
                             sys.stdout.write(f'Sleep {delay}... ')
                             sys.stdout.flush()
@@ -292,7 +299,6 @@ def get_standings(self, users=None, statistics=None, **kwargs):
 
         return standings
 
-    @RateLimiter(max_calls=5, period=1)
     @staticmethod
     def fetch_profle_page(user):
         for format_url in (
@@ -303,7 +309,7 @@ def fetch_profle_page(user):
             page_url = None
             url = format_url.format(user=quote(user))
             try:
-                ret = REQ.get(url, return_url=True)
+                ret = Statistic._get(url, return_url=True)
                 if not ret:
                     continue
                 page, page_url = ret
@@ -320,120 +326,121 @@ def fetch_profle_page(user):
     @staticmethod
     def get_users_infos(users, resource=None, accounts=None, pbar=None):
 
-        with PoolExecutor(max_workers=4) as executor:
-            for user, (page, url) in zip(users, executor.map(Statistic.fetch_profle_page, users)):
-                if pbar:
-                    pbar.update()
+        for user, (page, url) in zip(users, map(Statistic.fetch_profle_page, users)):
+            if pbar:
+                pbar.update()
 
-                if page is None:
-                    yield {'delete': True}
-                    continue
+            if page is None:
+                yield {'delete': True}
+                continue
 
-                match = re.search(r'jQuery.extend\(Drupal.settings,(?P<data>[^;]*)\);$', str(page), re.MULTILINE)
-                data = json.loads(match.group('data'))
-                if 'date_versus_rating' not in data:
-                    info = {}
-                    info['is_team'] = True
-                    regex = '<table[^>]*cellpadding=""[^>]*>.*?</table>'
-                    match = re.search(regex, page, re.DOTALL)
-                    if match:
-                        html_table = match.group(0)
-                        table = parsed_table.ParsedTable(html_table)
-                        for r in table:
-                            for k, v in list(r.items()):
-                                k = k.lower().replace(' ', '_')
-                                info[k] = v.value
-
-                    matches = re.finditer(r'''
-                                          <td[^>]*>\s*<b[^>]*>Member[^<]*</b>\s*</td>\s*
-                                          <td[^>]*><a[^>]*href\s*=\s*"[^"]*/users/(?P<member>[^"/]*)"[^>]*>
-                                          ''', page, re.VERBOSE)
-                    coders = set()
-                    for match in matches:
-                        coders.add(match.group('member'))
-                    if coders:
-                        info['members'] = list(coders)
-
-                    ret = {'info': info, 'coders': coders}
-                else:
-                    data = data['date_versus_rating']['all']
-
-                    matches = re.finditer(
-                        r'''
-                            <li[^>]*>\s*<label[^>]*>(?P<key>[^<]*):\s*</label>\s*
-                            <span[^>]*>(?P<value>[^<]*)</span>\s*</li>
-                        ''',
-                        page,
-                        re.VERBOSE,
-                    )
-
-                    info = {}
-                    for match in matches:
-                        key = match.group('key').strip().replace(' ', '_').lower()
-                        value = match.group('value').strip()
-                        info[key] = value
-
-                    match = re.search('<h1[^>]*class="h2-style"[^>]*>(?P<name>[^<]*)</h1>', page)
-                    if match:
-                        info['name'] = html.unescape(match.group('name').strip())
-
-                    match = re.search(r'''<header[^>]*>\s*<img[^>]*src=["'](?P<src>[^"']*)["'][^>]*>\s*<h1''', page)
-                    if match:
-                        src = urljoin(url, match.group('src'))
-                        if 'default' not in src.split('/')[-1]:
-                            response = requests.head(src)
-                            if response.status_code < 400 and response.headers.get('Content-Length', '0') != '0':
-                                info['avatar_url'] = src
-
-                    contest_addition_update_params = {'clear_rating_change': True}
-                    update = contest_addition_update_params.setdefault('update', {})
-                    by = contest_addition_update_params.setdefault('by', ['key'])
-                    prev_rating = None
-                    for row in data:
-                        rating = row.get('rating')
-                        if not rating:
-                            continue
-                        rating = int(rating)
-                        info['rating'] = rating
-
-                        code = row.get('code')
-                        name = row.get('name')
-                        end_time = row.get('end_date')
-                        if code:
-                            if re.search(r'\bdiv[ision]*[-_\s]+[ABCD1234]\b', name, re.I) \
-                               and re.search('[ABCD]$', code):
-                                code = code[:-1]
-
-                            u = update.setdefault(code, OrderedDict())
-                            u['new_rating'] = rating
-                            if prev_rating is not None:
-                                u['old_rating'] = prev_rating
-                                u['rating_change'] = rating - prev_rating
-                            u['_group'] = row['code']
-
-                            new_name = name
-                            new_name = re.sub(r'\s*\([^\)]*\brated\b[^\)]*\)$', '', new_name, flags=re.I)
-                            new_name = re.sub(r'\s*\bdiv(ision)?[-_\s]+[ABCD1234]$', '', new_name, flags=re.I)
-
-                            if new_name != name:
-                                if 'title' not in by:
-                                    by.append('title')
-                                update[new_name] = u
-
-                            if end_time:
-                                end_time = arrow.get(end_time)
-                                year = str(end_time.year)
-                                if code.endswith(year[-2:]) and not code.endswith(year):
-                                    update[code[:-2] + year] = u
-
-                        prev_rating = rating
-
-                    ret = {
-                        'info': info,
-                        'contest_addition_update_params': contest_addition_update_params,
-                    }
-
-                yield ret
+            match = re.search(r'jQuery.extend\(Drupal.settings,(?P<data>[^;]*)\);$', str(page), re.MULTILINE)
+            data = json.loads(match.group('data'))
+            if 'date_versus_rating' not in data:
+                info = {}
+                info['is_team'] = True
+                regex = '<table[^>]*cellpadding=""[^>]*>.*?</table>'
+                match = re.search(regex, page, re.DOTALL)
+                if match:
+                    html_table = match.group(0)
+                    table = parsed_table.ParsedTable(html_table)
+                    for r in table:
+                        for k, v in list(r.items()):
+                            k = k.lower().replace(' ', '_')
+                            info[k] = v.value
+
+                matches = re.finditer(r'''
+                                      <td[^>]*>\s*<b[^>]*>Member[^<]*</b>\s*</td>\s*
+                                      <td[^>]*><a[^>]*href\s*=\s*"[^"]*/users/(?P<member>[^"/]*)"[^>]*>
+                                      ''', page, re.VERBOSE)
+                coders = set()
+                for match in matches:
+                    coders.add(match.group('member'))
+                if coders:
+                    info['members'] = list(coders)
+
+                ret = {'info': info, 'coders': coders}
+            else:
+                data = data['date_versus_rating']['all']
+
+                matches = re.finditer(
+                    r'''
+                        <li[^>]*>\s*<label[^>]*>(?P<key>[^<]*):\s*</label>\s*
+                        <span[^>]*>(?P<value>[^<]*)</span>\s*</li>
+                    ''',
+                    page,
+                    re.VERBOSE,
+                )
+
+                info = {}
+                for match in matches:
+                    key = match.group('key').strip().replace(' ', '_').lower()
+                    value = match.group('value').strip()
+                    info[key] = value
+
+                match = re.search('<h1[^>]*class="h2-style"[^>]*>(?P<name>[^<]*)</h1>', page)
+                if match:
+                    info['name'] = html.unescape(match.group('name').strip())
+
+                match = re.search(r'''<header[^>]*>\s*<img[^>]*src=["'](?P<src>[^"']*)["'][^>]*>\s*<h1''', page)
+                if match:
+                    src = urljoin(url, match.group('src'))
+                    if 'default' not in src.split('/')[-1]:
+                        response = requests.head(src)
+                        if response.status_code < 400 and response.headers.get('Content-Length', '0') != '0':
+                            info['avatar_url'] = src
+
+                contest_addition_update_params = {'clear_rating_change': True, 'try_fill_missed_ranks': True}
+                update = contest_addition_update_params.setdefault('update', {})
+                by = contest_addition_update_params.setdefault('by', ['key'])
+                prev_rating = None
+                for row in data:
+                    rating = row.get('rating')
+                    if not rating:
+                        continue
+                    rating = int(rating)
+                    info['rating'] = rating
+
+                    code = row.get('code')
+                    name = row.get('name')
+                    end_time = row.get('end_date')
+                    if code:
+                        if re.search(r'\bdiv[ision]*[-_\s]+[ABCD1234]\b', name, re.I) \
+                           and re.search('[ABCD]$', code):
+                            code = code[:-1]
+
+                        u = update.setdefault(code, OrderedDict())
+                        u['new_rating'] = rating
+                        if prev_rating is not None:
+                            u['old_rating'] = prev_rating
+                            u['rating_change'] = rating - prev_rating
+                        u['_group'] = row['code']
+                        u['_rank'] = row['rank']
+                        u['_with_create'] = True
+
+                        new_name = name
+                        new_name = re.sub(r'\s*\([^\)]*\brated\b[^\)]*\)$', '', new_name, flags=re.I)
+                        new_name = re.sub(r'\s*\bdiv(ision)?[-_\s]+[ABCD1234]$', '', new_name, flags=re.I)
+
+                        if new_name != name:
+                            if 'title' not in by:
+                                by.append('title')
+                            update[new_name] = u
+
+                        if end_time:
+                            end_time = arrow.get(end_time)
+                            year = str(end_time.year)
+                            if code.endswith(year[-2:]) and not code.endswith(year):
+                                update[code[:-2] + year] = u
+
+                    prev_rating = rating
+
+                ret = {
+                    'info': info,
+                    'contest_addition_update_params': contest_addition_update_params,
+                }
+
+            yield ret
 
     @transaction.atomic()
     @staticmethod
@@ -453,10 +460,9 @@ def update_submissions(account, resource):
         contests_cache = dict()
         stats_cache = dict()
 
-        @RateLimiter(max_calls=5, period=1)
         def fetch_submissions(page=0):
             url = Statistic.SUBMISSIONS_URL_.format(user=account.key, page=page)
-            response = REQ.get(url)
+            response = Statistic._get(url)
             data = json.loads(response)
             data['url'] = url
             data['page'] = page
@@ -581,20 +587,19 @@ def process_submissions(data):
         def process_pagination():
             nonlocal max_page
             last_page = -1
-            with PoolExecutor(max_workers=4) as executor:
-                while max_page is None or last_page + 1 < max_page:
-                    last_page += 1
-                    data = fetch_submissions(last_page)
-                    if not process_submissions(data):
-                        break
-
-                    with tqdm.tqdm(total=max_page - last_page - 1) as pbar:
-                        for data in executor.map(fetch_submissions, range(last_page + 1, max_page)):
-                            result = process_submissions(data)
-                            last_page = data['page']
-                            pbar.update()
-                            if not result:
-                                return
+            while max_page is None or last_page + 1 < max_page:
+                last_page += 1
+                data = fetch_submissions(last_page)
+                if not process_submissions(data):
+                    break
+
+                with tqdm.tqdm(total=max_page - last_page - 1) as pbar:
+                    for data in map(fetch_submissions, range(last_page + 1, max_page)):
+                        result = process_submissions(data)
+                        last_page = data['page']
+                        pbar.update()
+                        if not result:
+                            return
 
         max_page = None
         process_pagination()
@@ -608,6 +613,7 @@ def process_pagination():
         return ret
 
     @staticmethod
+    @RateLimiter(max_calls=1, period=1)
     def get_problem_info(problem, contest, cache, **kwargs):
         code = problem['code']
         if code in cache:
diff --git a/src/ranking/management/modules/common/__init__.py b/src/ranking/management/modules/common/__init__.py
index d0430824..49d30ff6 100644
--- a/src/ranking/management/modules/common/__init__.py
+++ b/src/ranking/management/modules/common/__init__.py
@@ -143,6 +143,10 @@ def update_submissions(account, resource):
     def get_problem_info(problem, **kwargs):
         raise NotImplementedError()
 
+    @staticmethod
+    def get_new_problems(resource, **kwargs):
+        raise NotImplementedError()
+
 
 def save_proxy(req, filepath):
     if req.proxer.proxy:
diff --git a/src/ranking/management/modules/leetcode.py b/src/ranking/management/modules/leetcode.py
index d3d5c463..1e18ee45 100644
--- a/src/ranking/management/modules/leetcode.py
+++ b/src/ranking/management/modules/leetcode.py
@@ -228,9 +228,10 @@ def fetch_ranking(domain, region, n_page=None):
                             solved = 0
                             stats = get_item(statistics, member, {})
                             problems = r.setdefault('problems', get_copy_item(stats, 'problems', {}))
-                            clear_problems_fields(problems)
+                            submitted_keys = set()
                             for i, (k, s) in enumerate(submissions.items(), start=1):
                                 short = problems_info[k]['short']
+                                submitted_keys.add(short)
                                 p = problems.setdefault(short, {})
                                 time = datetime.fromtimestamp(s['date']) - start_time
                                 p['time_in_seconds'] = time.total_seconds()
@@ -249,6 +250,7 @@ def fetch_ranking(domain, region, n_page=None):
 
                                     skip = skip or p['submission_id'] in solutions_ids
                                     solutions_ids.add(p['submission_id'])
+                            clear_problems_fields(problems, submitted_keys=submitted_keys)
 
                             if already_added:
                                 continue
@@ -1010,13 +1012,46 @@ def get_field(*fields, raise_not_found=True):
             account.save(update_fields=['info', 'last_submission'])
         return ret
 
+    def get_problem_info_from_dict(question):
+        ret = dict(
+            tags=[t['name'].lower() for t in question['topicTags']],
+            difficulty=question['difficulty'].lower(),
+            hints=question['hints'],
+            premium=question['isPaidOnly'],
+            accepted_rate=round_sig(question['acRate'], 3),
+            id=as_number(question['questionFrontendId']),
+            likes=as_number(question['likes']),
+            dislikes=as_number(question['dislikes']),
+        )
+
+        if ret['likes'] or ret['dislikes']:
+            ret['likes_percent'] = round_sig(ret['likes'] * 100 / (ret['likes'] + ret['dislikes']), 4)
+            ret['dislikes_percent'] = round_sig(ret['dislikes'] * 100 / (ret['likes'] + ret['dislikes']), 4)
+
+        if question.get('stats'):
+            stats = json.loads(question['stats'])
+            ret['n_accepted_submissions'] = stats['totalAcceptedRaw']
+            ret['n_total_submissions'] = stats['totalSubmissionRaw']
+
+        if 'categoryTitle' in question:
+            kinds = []
+            kind = question.get('categoryTitle')
+            if kind:
+                kind = kind.lower()
+                if kind not in ['algorithms']:
+                    if kind not in ret['tags']:
+                        ret['tags'].append(kind)
+                    kinds.append(kind)
+            ret['kinds'] = kinds
+        return ret
+
     @staticmethod
     def get_problem_info(problem, **kwargs):
         slug = get_item(problem, 'slug')
         params = {
             'operationName': 'questionData',
             'variables': {'titleSlug': slug},
-            'query': 'query questionData($titleSlug: String!) { question(titleSlug: $titleSlug) { questionId difficulty contributors { profileUrl } topicTags { name } hints acRate questionFrontendId isPaidOnly } }',  # noqa: E501
+            'query': 'query questionData($titleSlug: String!) { question(titleSlug: $titleSlug) { questionId difficulty topicTags { name } hints acRate questionFrontendId isPaidOnly likes dislikes stats } }',  # noqa: E501
         }
         page = Statistic._get(
             'https://leetcode.com/graphql',
@@ -1028,12 +1063,71 @@ def get_problem_info(problem, **kwargs):
         if not question:
             return None
 
-        ret = dict(
-            tags=[t['name'].lower() for t in question['topicTags']],
-            difficulty=question['difficulty'].lower(),
-            hints=question['hints'],
-            premium=question['isPaidOnly'],
-            accepted_rate=round_sig(question['acRate'], 3),
-            id=as_number(question['questionFrontendId']),
-        )
-        return ret
+        return Statistic.get_problem_info_from_dict(question)
+
+    @staticmethod
+    def get_new_problems(resource, limit, **kwargs):
+        n_page = 0
+        per_page = 500
+        if limit:
+            per_page = min(per_page, limit)
+        new_problems = []
+        total = None
+        while (
+            (not limit or len(new_problems) < limit) and
+            (not total or len(new_problems) < total)
+        ):
+            params = {
+                "query": """
+                query problemsetQuestionList($categorySlug: String, $limit: Int, $skip: Int, $filters: QuestionListFilterInput) {
+                    problemsetQuestionList: questionList(
+                        categorySlug: $categorySlug
+                        limit: $limit
+                        skip: $skip
+                        filters: $filters
+                    ) {
+                        total: totalNum
+                        questions: data { title titleSlug questionId difficulty topicTags { name } hints acRate questionFrontendId isPaidOnly likes dislikes stats categoryTitle }
+                    }
+                }
+                """,  # noqa: E501
+                "variables": {
+                    "categorySlug": "all-code-essentials",
+                    "skip": n_page * per_page,
+                    "limit": per_page,
+                    "filters": {
+                        "orderBy": "FRONTEND_ID",
+                        "sortOrder": "DESCENDING"
+                    }
+                },
+                "operationName": "problemsetQuestionList"
+            }
+            page = Statistic._get(
+                'https://leetcode.com/graphql',
+                content_type='application/json',
+                post=json.dumps(params).encode('utf-8'),
+                n_attempts=3,
+            )
+            data = json.loads(page)
+            data = data['data']['problemsetQuestionList']
+            total = data['total']
+            questions = data['questions']
+            for question in questions:
+                info = Statistic.get_problem_info_from_dict(question)
+                kinds = info.pop('kinds', [])
+                problem = dict(
+                    key=question['questionId'],
+                    name=question['title'],
+                    slug=question['titleSlug'],
+                    kinds=kinds,
+                    n_accepted_submissions=info.pop('n_accepted_submissions', None),
+                    n_total_submissions=info.pop('n_total_submissions', None),
+                    info=info,
+                )
+                new_problems.append(problem)
+                if len(new_problems) == limit:
+                    break
+            n_page += 1
+            if not questions:
+                break
+        return new_problems
diff --git a/src/ranking/models.py b/src/ranking/models.py
index 60770d0a..c2e9d2ee 100644
--- a/src/ranking/models.py
+++ b/src/ranking/models.py
@@ -94,6 +94,11 @@ def avatar_url(self, resource=None):
             except KeyError:
                 pass
 
+    def profile_url(self, resource=None):
+        resource = resource or self.resource
+        info = self.dict_with_info()
+        return resource.profile_url.format(**info)
+
     @staticmethod
     def is_special_info_field(field):
         if not field:
@@ -320,7 +325,11 @@ def update_account_by_coders(account, default_url=None):
                 break
 
     if isinstance(url, bool):
-        url = default_url
+        if default_url is True:
+            args = [account.key, account.resource.host]
+            url = reverse('coder:account', args=args)
+        else:
+            url = default_url
 
     if url:
         account.url = url
diff --git a/src/ranking/utils.py b/src/ranking/utils.py
index b6f1de6a..352b6fc3 100644
--- a/src/ranking/utils.py
+++ b/src/ranking/utils.py
@@ -52,15 +52,26 @@ def rename_account(old_account, new_account):
     return new_account
 
 
-def clear_problems_fields(problems):
+def clear_problems_fields(problems, submitted_keys=None):
     if not problems:
         return
-    for v in problems.values():
+    to_remove = []
+    for k, v in problems.items():
         if not isinstance(v, dict):
             continue
         v.pop('first_ac', None)
         v.pop('first_ac_of_all', None)
 
+        if submitted_keys is not None and k not in submitted_keys:
+            upsolving = v.pop('upsolving', None)
+            v.clear()
+            if upsolving:
+                v['upsolving'] = upsolving
+            if not v:
+                to_remove.append(k)
+    for k in to_remove:
+        problems.pop(k)
+
 
 def to_canonize_str(data):
     return json.dumps(data, sort_keys=True)
@@ -141,13 +152,13 @@ def fill_missed_ranks(account, contest_keys, fields, contest_addition_update):
             contests = list(qs.filter(has_skip=True))
         if not contests:
             contests = list(base_contests)
-            if len(contests) == 1:
-                contest = contests[0]
+            if len(contests) == 0:
+                LOG.info('Not found contest with key %s, fields = %s', contest_key, fields)
+                continue
+            if len(contests) == 1 and not addition_update.get('_with_create'):
                 missed += 1
-                LOG.info('Missed #%d rank %s for %s in %s', missed,  rank, account, contest)
-                # call_command('parse_statistic', contest_id=contest.pk, users=['jcaoso1a@.com'])
-                # ok = True
-            continue
+                LOG.info('Missed #%d rank %s for %s in %s', missed,  rank, account, contests[0])
+                continue
         if len(contests) > 1:
             LOG.warning('Multiple contests with same key %s = %s', contest_key, contests)
             continue
@@ -198,11 +209,9 @@ def account_update_contest_additions(
     for contest_key, update in contest_addition_update.items():
         group = update.get('_group')
         if group:
-            if try_fill_missed_ranks:
-                try_fill_missed_ranks = False
-                LOG.warning("Grouped contests don't support fill_missed_ranks")
-                continue
             grouped_contest_keys[group].append(contest_key)
+    if grouped_contest_keys and try_fill_missed_ranks:
+        LOG.warning("Grouped contests with fill_missed_ranks")
 
     iteration = 0
     renaming_contest_keys = set(contest_keys)
@@ -247,6 +256,17 @@ def account_update_contest_additions(
                     contest_keys.discard(contest_key)
                     renaming_contest_keys.discard(contest_key)
 
+            if stat.place is None:
+                rank = ordered_dict.pop('_rank', None)
+                if rank is not None and '_rank_field' not in ordered_dict:
+                    LOG.info('Rank without rank_field for %s in %s = %s', account, contest, rank)
+                    stat.place = rank
+                    stat.place_as_int = rank
+                    stat.save(update_fields=['place', 'place_as_int'])
+
+            for k in [k for k in ordered_dict if k.startswith('_')]:
+                ordered_dict.pop(k)
+
             addition.update(dict(ordered_dict))
             for k, v in ordered_dict.items():
                 if v is None:
@@ -281,12 +301,12 @@ def account_update_contest_additions(
             if renaming_check(account, renaming_contest_keys, fields, contest_addition_update):
                 try_fill_missed_ranks = False
                 continue
-        if try_fill_missed_ranks and account.try_fill_missed_ranks_time is None:
+        if try_fill_missed_ranks:
             try_fill_missed_ranks = False
             if fill_missed_ranks(account, renaming_contest_keys, fields, contest_addition_update):
                 continue
         if contest_keys:
-            out_contests = list(grouped_contest_keys.values()) or list(contest_keys)
+            out_contests = list(grouped_contest_keys.items()) or list(contest_keys)
             LOG.warning('Not found %d contests for %s = %s%s',
                         len(out_contests), account, out_contests[:5], '...' if len(out_contests) > 5 else '')
         break
diff --git a/src/ranking/views.py b/src/ranking/views.py
index 0812993a..bf169c33 100644
--- a/src/ranking/views.py
+++ b/src/ranking/views.py
@@ -90,6 +90,7 @@ def standings_list(request, template='standings_list.html', extra_context=None):
                 'coder': {'fields': ['statistics__account__coders__username']},
                 'account': {'fields': ['statistics__account__key', 'statistics__account__name'], 'suff': '__iregex'},
                 'stage': {'fields': ['stage'], 'suff': '__isnull', 'func': lambda v: False},
+                'kind': {'fields': ['kind'], 'suff': '__isnull', 'func': lambda v: False},
                 'medal': {'fields': ['with_medals'], 'func': lambda v: True},
                 'advance': {'fields': ['with_advance'], 'func': lambda v: True},
                 'year': {'fields': ['start_time__year', 'end_time__year']},
@@ -1244,6 +1245,9 @@ def add_field_to_select(f):
             statistics = statistics.filter(Q(account__coders__in=party.coders.all()) |
                                            Q(account__coders__in=party.admins.all()) |
                                            Q(account__coders=party.author))
+        elif search.startswith('score:'):
+            _, score = search.split(':')
+            statistics = statistics.filter(solving=score)
         else:
             if search.startswith('regex:'):
                 search = search[search.index(':') + 1:]
diff --git a/src/static/css/base.css b/src/static/css/base.css
index 7bc5d2bf..6f11249c 100644
--- a/src/static/css/base.css
+++ b/src/static/css/base.css
@@ -46,6 +46,12 @@ table.center {
   display: inline-block;
 }
 
+.label-tag {
+  border: 1px solid !important;
+  padding-top: 1px !important;
+  padding-bottom: 1px !important;
+}
+
 
 /*
  * Row flex
@@ -819,7 +825,7 @@ tr:has(+ tr[data-delete-on-duplicate]:not(tr[data-delete-on-duplicate-stop])) {
 
 
 /*
- * table
+ * Table
  */
 
 .no-stretch {
@@ -829,6 +835,34 @@ tr:has(+ tr[data-delete-on-duplicate]:not(tr[data-delete-on-duplicate-stop])) {
 }
 
 
+@media(max-width:767px) {
+  table.table.table-stacked thead {
+    display: none;
+  }
+
+  .table-responsive table.table.table-stacked tbody tr td {
+    white-space: normal;
+  }
+
+  table.table.table-stacked tbody tr td {
+    border: none;
+    display: block;
+    padding: 2px;
+    text-align: center;
+  }
+
+  table.table.table-stacked tbody tr {
+    border: 1px solid #ddd;
+  }
+
+  .display-block-xs {
+    display: block !important;
+  }
+}
+
+
+
+
 /*
  * copy-url-help
  */
diff --git a/src/static/css/profile.css b/src/static/css/profile.css
index d4f0db27..af1e23ff 100644
--- a/src/static/css/profile.css
+++ b/src/static/css/profile.css
@@ -12,20 +12,20 @@
 }
 
 #writers .date,
-#contests td,
-#contests th {
+.contests td,
+.contests th {
   text-align: center;
   vertical-align: middle !important;
 }
 
-#contests .title {
+.contest .title {
   text-align: left;
   white-space: normal;
 }
 
 #list-accounts tr td,
 #writers td,
-#contests tr td {
+.contests tr td {
   white-space: nowrap;
 }
 
@@ -40,7 +40,7 @@
   height: 10px;
 }
 
-#contests .endless_container {
+.contests .endless_container {
   margin-right: -15px;
   margin-left: -15px;
 }
diff --git a/src/static/css/standings.css b/src/static/css/standings.css
index 0a965c40..6d3bb6e0 100644
--- a/src/static/css/standings.css
+++ b/src/static/css/standings.css
@@ -207,14 +207,6 @@ a.solution:hover span {
   background-color: #d9edf7;
 }
 
-.table-striped > * > tr:nth-of-type(even)>td {
-  background-color: #ffffff;
-}
-
-.table-striped > * > tr:nth-of-type(odd)>td {
-  background-color: #f9f9f9;
-}
-
 .open-submissions {
   cursor: pointer;
 }
diff --git a/src/static/css/standings_list.css b/src/static/css/standings_list.css
index 328a98ad..08fafa1f 100644
--- a/src/static/css/standings_list.css
+++ b/src/static/css/standings_list.css
@@ -38,3 +38,8 @@
   min-width: 50px;
   display: inline-block;
 }
+
+#standings_list .rank {
+  text-align: center;
+}
+
diff --git a/src/static/img/resources/ac_nowcoder.png b/src/static/img/resources/ac_nowcoder.png
new file mode 100644
index 00000000..bfd7613a
Binary files /dev/null and b/src/static/img/resources/ac_nowcoder.png differ
diff --git a/src/static/img/resources/usaco_guide.png b/src/static/img/resources/usaco_guide.png
new file mode 100644
index 00000000..2515d8f8
Binary files /dev/null and b/src/static/img/resources/usaco_guide.png differ
diff --git a/src/static/js/base.js b/src/static/js/base.js
index e5e182dc..af2273ca 100644
--- a/src/static/js/base.js
+++ b/src/static/js/base.js
@@ -738,18 +738,15 @@ $(function() {
 function clear_url_parameters() {
   var url = new URL(window.location.href)
   if (url.searchParams.has('search') || url.searchParams.has('sort_order')) {
-    var disabled_fields = new Set(['timeline', 'charts', 'fullscreen', 'play', 'full_table'])
+    var disabled_fields = new Set(['timeline', 'charts', 'fullscreen', 'play', 'full_table', 'unfreezing'])
     var to_remove = new Set()
     var remove_sort = true
     for ([field, value] of url.searchParams.entries()) {
       if (field.startsWith('sort') && field != 'sort_order') {
         remove_sort = false
       }
-      if (
-        (disabled_fields.has(field) && value == 'off') ||
-        (!disabled_fields.has(field) && !value) ||
-        (field == 'groupby' && value == 'none')
-      ) {
+      var disabled = disabled_fields.has(field) || field.startsWith('with_')
+      if ((disabled && value == 'off') || (!disabled && !value) || (field == 'groupby' && value == 'none')) {
         to_remove.add(field)
       } else {
         to_remove.delete(field)
@@ -767,3 +764,19 @@ function clear_url_parameters() {
 }
 
 $(clear_url_parameters)
+
+
+/*
+ * user locale
+ */
+
+function user_locale() {
+  return navigator.language || navigator.userLanguage || navigator.browserLanguage || navigator.systemLanguage || 'en'
+}
+
+function is_12_hour_clock() {
+  var time_format_options = {hour: 'numeric', minute: 'numeric'}
+  var date_time_format = new Intl.DateTimeFormat(user_locale(), time_format_options)
+  var time_parts = date_time_format.formatToParts(new Date())
+  return time_parts.some(time_part => time_part.type === 'dayPeriod')
+}
diff --git a/src/static/js/contest/calendar.js b/src/static/js/contest/calendar.js
index 28946dff..b7a4fca0 100644
--- a/src/static/js/contest/calendar.js
+++ b/src/static/js/contest/calendar.js
@@ -29,6 +29,14 @@ $(function() {
         }
     }
 
+    var hour12 = is_12_hour_clock()
+    var time_format = {
+        hour: 'numeric',
+        minute: '2-digit',
+        meridiem: hour12? 'short' : false,
+        hour12: hour12,
+    }
+
     var calendar_views = {
         dayGridMonth: {},
         timeGridWeek: {},
@@ -66,6 +74,8 @@ $(function() {
         firstDay: 1,
         allDaySlot: true,
         timeZone: timezone,
+        eventTimeFormat: time_format,
+        slotLabelFormat: time_format,
         events: function (fetchInfo, successCallback, failureCallback) {
             var url = new URL(window.location.href)
             $.ajax({
@@ -185,6 +195,10 @@ $(function() {
             Cookies.set('calendar_view', calendar.view.type)
             stylize_button()
         },
+        datesSet: function() {
+            Cookies.set('calendar_view', calendar.view.type)
+            stylize_button()
+        },
         eventClick: function (data, event, view) {
             return true
         },
diff --git a/src/static/js/standings.js b/src/static/js/standings.js
index 78ef5e22..fe0f31e6 100644
--- a/src/static/js/standings.js
+++ b/src/static/js/standings.js
@@ -1302,10 +1302,14 @@ $(function() {
     url = window.location.href
     url = url.replace(/\btimeline=[^&]+&?/gi, '')
     url = url.replace(/\bt_[a-z]+=[^&]+&?/gi, '')
+    url = url.replace(/\bunfreezing\b&?/gi, '')
     url = url.replace(/[\?&]$/, '')
     url += (url.indexOf('?') == -1? '?' : '&') + 'timeline=' + duration_to_text(contest_duration * CURRENT_PERCENT)
     const keys = ['duration', 'step', 'delay', 'freeze']
     keys.forEach(function(k) { el = $('#timeline-' + k); url += '&t_' + k + '=' + el.val() })
+    if (unfreezing) {
+      url += '&unfreezing'
+    }
 
     var dialog = bootbox.dialog({
       title: "Share standings url with timeline",
diff --git a/src/templates/calendar.html b/src/templates/calendar.html
index 56443da1..d19c3920 100644
--- a/src/templates/calendar.html
+++ b/src/templates/calendar.html
@@ -1,6 +1,6 @@
 <script>
   customButtonDesc = { {% for i in ignore_filters %}cb{{ i.id }}: { text: '{{ i.name|safe }}', data: '{{ i.id }}' }{% if forloop.revcounter0 %}, {% endif %}{% endfor %} }
-  customButtonGroup = '{% for i in ignore_filters %}{% if i.id == 0 %} {% elif forloop.counter0 %},{% endif %}cb{{ i.id }}{% endfor %}'
+  customButtonGroup = '{% for i in ignore_filters %}{% if forloop.counter0 %}{% if i.id == 0 %} {% else %},{% endif %}{% endif %}cb{{ i.id }}{% endfor %}'
   customButtonSelector = [{% for i in ignore_filters %}{% if i.id > 0 %}'.fc-cb{{ i.id }}-button',{% endif %}{% endfor %}].join(',')
   timezone = '{{ timezone }}'
   timezone_hm = '{{ timezone|get_timezone_offset_hm }}'
diff --git a/src/templates/navbar.html b/src/templates/navbar.html
index 33ecc9d2..00aecf30 100644
--- a/src/templates/navbar.html
+++ b/src/templates/navbar.html
@@ -75,7 +75,7 @@
                         <li><a href="{% url 'charts' %}">{% icon_to 'charts' False %}</a></li>
                         <li>
                             <a href="{% if navbar_database_viewname %}{% url 'admin:'|concat:navbar_database_viewname %}{% else %}{% url 'admin:index' %}{% endif %}">
-                            {% icon_to 'database' navbar_database_viewname|default:'databse'|title_field position='bottom' %}
+                            {% icon_to 'database' navbar_database_viewname|default:'database'|title_field position='bottom' %}
                             </a>
                         </li>
                         {% endif %}
diff --git a/src/templates/problems_paging.html b/src/templates/problems_paging.html
index 096fc8df..1b97d0f1 100644
--- a/src/templates/problems_paging.html
+++ b/src/templates/problems_paging.html
@@ -22,7 +22,12 @@
 {% endif %}
 <tr class="show-hidden-activity-on-hover show-hidden-note-on-hover">
   <td class="problem-date-column">
-    <div title="{{ problem.time|timezone:timezone|format_time:timeformat }}" data-toggle="tooltip">{{ problem.time|timezone:timezone|naturalday }}</div> </td>
+    {% if problem.time is not None %}
+    <div title="{{ problem.time|timezone:timezone|format_time:timeformat }}" data-toggle="tooltip">{{ problem.time|timezone:timezone|naturalday }}</div>
+    {% else %}
+    <span class="text-muted">&mdash;</span>
+    {% endif %}
+  </td>
   <td class="problem-rating-column">
     {% if problem.rating is not None %}
       {% coder_color_circle problem.resource problem.rating %}
@@ -38,7 +43,7 @@
     {% endif %}
   </td>
   <td class="problem-progress-column">
-    {% if problem.n_total %}
+    {% if problem.n_total or problem.n_total_submissions %}
       {% include 'standings_problem_progress.html' with problem=problem contest="" %}
     {% else %}
       <span class="text-muted">&mdash;</span>
@@ -80,10 +85,28 @@
         <img data-toggle="tooltip" data-placement="top" title="{{ problem.resource.host }}" src="{{ problem.resource.icon|media_size:'32x32' }}" width="16" height="16"/>
       </a>
       {% if problem.actual_url %}<a href="{{ problem.actual_url }}" target="_blank" rel="noopener">{% endif %}
+        {% if not selected_resource %}
+          {% for field in problem.resource.problems_fields.fixed_fields %}{{ problem.info|get_item:field }}{% endfor %}
+        {% endif %}
         {% trim_to problem.name 50 %}
       {% if problem.actual_url %}</a>{% endif %}
+
+      {% if problem.kinds %}
+        {% for kind in problem.kinds %}
+          {% if not problem.resource|is_major_kind:kind %}
+            {% label_tag kind solution_class %}
+          {% endif %}
+        {% endfor %}
+      {% endif %}
+
       {% if favorite_problems %}{% activity_action "fav" problem %}{% endif %}
 
+      {% if problem.resource.problems_fields.locking %}
+        {% with locked=problem.info|get_item:problem.resource.problems_fields.locking.field %}
+        {% if locked %}{% icon_to 'locked' problem.resource.problems_fields.locking.title class="text-muted" %}{% endif %}
+        {% endwith %}
+      {% endif %}
+
       {% note_action "note" problem %}
 
       <span class="hidden-activity">
diff --git a/src/templates/profile.html b/src/templates/profile.html
index b2770d10..745a3cca 100644
--- a/src/templates/profile.html
+++ b/src/templates/profile.html
@@ -217,16 +217,14 @@ <h3>Contests</h3>
 
     {% if statistics.exists %}
     <div class="panel panel-default table-responsive">
-      <table id="contests" class="table table-hover table-striped table-condensed">
-        <tr>
-          <th></th>
+      <table id="contests" class="contests table table-hover table-striped table-condensed table-stacked">
+        <thead><tr>
+          <th class="hidden-xs"></th>
           <th>Rank</th>
           <th>Score</th>
           <th>Rating</th>
-          <th title="Rating change" data-toggle="tooltip" data-html="true" data-placement="bottom">&Delta;</th>
           {% if coder.has_global_rating %}
           <th>Global</th>
-          <th title="Global rating change" data-toggle="tooltip" data-html="true" data-placement="bottom">&Delta;</th>
           {% endif %}
           <th class="date">Date</th>
 
@@ -235,11 +233,11 @@ <h3>Contests</h3>
           <th>{{ field|title_field|split:" "|join:"<br>" }}</th>
           {% endfor %}
           {% endif %}
-
-          <th></th>
           <th class="title">Event</th>
-        </tr>
+        </tr></thead>
+        <tbody>
         {% include 'profile_contests_paging.html' %}
+        </tbody>
       </table>
     </div>
     <script>$('#contests').endlessPaginate({onCompleted: toggle_tooltip});</script>
diff --git a/src/templates/profile_contests_paging.html b/src/templates/profile_contests_paging.html
index ed102dd0..02c1152a 100644
--- a/src/templates/profile_contests_paging.html
+++ b/src/templates/profile_contests_paging.html
@@ -4,7 +4,7 @@
 {% for statistic in statistics %}
 {% with contest=statistic.contest resource=statistic.contest.resource %}
 <tr class="contest{% if statistic.addition.medal %} {{ statistic.addition.medal|lower }}-medal{% endif %}{% if contest.is_running %} success{% endif %}" id="cid-{{ contest.id }}">
-    <td>
+    <td class="hidden-xs">
     {% with division=statistic.addition.division %}
     {% with n_total=contest.info.problems.n_statistics|get_item:division|default:contest.n_statistics %}
         {% if n_total and statistic.place_as_int %}
@@ -48,33 +48,20 @@
     </td>
 
     <td>
-        {% with value=resource|get_new_rating_value:statistic.addition %}
-        {% if value is not None %}
-        <div class="{% coder_color_class resource value %}">
-            {% coder_color_circle resource value %}
-            {{ value }}
-        </div>
+        {% with rating_value=resource|get_new_rating_value:statistic.addition %}
+        {% if rating_value is not None %}
+        <span class="{% coder_color_class resource rating_value %}">
+            {% coder_color_circle resource rating_value %}
+            {{ rating_value }}
+        </span>
         {% else %}
         <small class='text-muted'>&#183;</small>
         {% endif %}
-        {% endwith %}
-    </td>
-    <td>
-        {% with value=statistic.addition.rating_change %}
-        {% with intvalue=value|toint %}
-        {% if intvalue or 'rating_change' in statistic.addition %}
-            <span class="rating-change{% if intvalue %} rating-change-{% if intvalue > 0 %}up{% else %}down{% endif %}{% endif %}">
-            {% if intvalue %}
-                <i class="fas fa-angle-{% if intvalue > 0 %}up{% else %}down{% endif %}"></i>{{ intvalue|abs }}
-            {% else %}
-                {{ value }}
-            {% endif %}
-            </span>
-        {% else %}
-            <small class='text-muted'>&#183;</small>
+
+        {% if 'rating_change' in statistic.addition %}
+            {% rating_change_template statistic.addition.rating_change %}
         {% endif %}
         {% endwith %}
-        {% endwith %}
     </td>
     {% if coder.has_global_rating %}
     <td>
@@ -83,22 +70,9 @@
         {% else %}
             <small class='text-muted'>&#183;</small>
         {% endif %}
-    </td>
-    <td>
+
         {% if statistic.global_rating_change is not None %}
-            {% with value=statistic.global_rating_change %}
-            {% with intvalue=value|toint %}
-            <span class="rating-change{% if intvalue %} rating-change-{% if intvalue > 0 %}up{% else %}down{% endif %}{% endif %}">
-            {% if intvalue %}
-                <i class="fas fa-angle-{% if intvalue > 0 %}up{% else %}down{% endif %}"></i>{{ intvalue|abs }}
-            {% else %}
-                {{ value }}
-            {% endif %}
-            </span>
-            {% endwith %}
-            {% endwith %}
-        {% else %}
-            <small class='text-muted'>&#183;</small>
+            {% rating_change_template statistic.global_rating_change %}
         {% endif %}
     </td>
     {% endif %}
@@ -118,8 +92,9 @@
     {% endfor %}
     {% endwith %}
     {% endif %}
-    <td><a{% if not search_resource and not params.resources %} href="{% url_transform request resource=resource.pk %}"{% endif %} title="{{ resource.host }}" data-toggle="tooltip"><img src="{{ resource.icon|media_size:'32x32' }}" width="16" height="16"/></a></td>
     <td class="title col-md-9 col-sm-8">
+        <a{% if not search_resource and not params.resources %} href="{% url_transform request resource=resource.pk %}"{% endif %} title="{{ resource.host }}" data-toggle="tooltip"><img src="{{ resource.icon|media_size:'32x32' }}" width="16" height="16"/></a>
+
         {% if contest.invisible %}<i class="far fa-eye-slash"></i>{% endif %}
         <a href="{% url 'ranking:standings' contest.title|slug contest.pk %}{% if not without_findme %}?find_me={{ statistic.pk }}{% endif %}">{{ contest.title }}</a>
         {% if statistic.addition.hack %}
@@ -129,26 +104,26 @@
         </span>
         {% endwith %}
         {% endif %}
-        <span class="problems">
-            {% if 'problems' in statistic.addition %}
-                {% if contest.info.problems %}
-                  {% for problem in contest|get_division_problems:statistic.addition %}
-                    {% with key=problem|get_problem_short  %}
-                    {% with stat=statistic.addition.problems|get_item:key %}
-                      {% include 'problem_stat.html' with short=problem|get_problem_header name=problem|get_problem_name stat=stat problem_url=problem.url full_score=problem.full_score %}
-                    {% endwith %}
-                    {% endwith %}
-                  {% endfor %}
-                {% else %}
-                  {% for k, v in statistic.addition.problems.items|sort %}
-                  {% include 'problem_stat.html' with short=k name=k stat=v problem_url=None full_score=None %}
-                  {% endfor %}
-                {% endif %}
-            {% endif %}
-        </span>
         {% if contest.has_submissions %}
-        <a href="{% url 'submissions:submissions' contest.title|slug contest.pk %}?account={{ statistic.account_id }}" class="database-link external-link invisible" target="_blank" rel="noopener noreferrer">{% icon_to "submissions" %}</a>
+        <a href="{% url 'submissions:submissions' contest.title|slug contest.pk %}?account={{ statistic.account_id }}" target="_blank" rel="noopener noreferrer">{% icon_to "submissions" %}</a>
         {% endif %}
+        <span class="problems display-block-xs">
+            {% with problems=statistic.addition.problems %}
+            {% if contest.info.problems %}
+              {% for problem in contest|get_division_problems:statistic.addition %}
+                {% with key=problem|get_problem_short  %}
+                {% with stat=problems|get_item:key %}
+                  {% include 'problem_stat.html' with short=problem|get_problem_header name=problem|get_problem_name stat=stat problem_url=problem.url full_score=problem.full_score %}
+                {% endwith %}
+                {% endwith %}
+              {% endfor %}
+            {% elif problems %}
+              {% for k, v in problems.items|sort %}
+              {% include 'problem_stat.html' with short=k name=k stat=v problem_url=None full_score=None %}
+              {% endfor %}
+            {% endif %}
+            {% endwith %}
+        </span>
         {% if perms.ranking.change_statistics %}
         <a href="{% url 'admin:ranking_statistics_change' statistic.id %}" class="database-link invisible" target="_blank" rel="noopener"><i class="fas fa-database"></i></a>
         {% endif %}
diff --git a/src/templates/standings.html b/src/templates/standings.html
index c2dd1da1..9873335b 100644
--- a/src/templates/standings.html
+++ b/src/templates/standings.html
@@ -99,6 +99,9 @@ <h3 id="standings-title" class="text-center">
       <a class="standings-resource" href="{% url 'clist:resource' contest.resource.host %}" data-toggle="tooltip" data-placement="top" title="{{ contest.resource.host }}"><img src="{{ contest.resource.icon|media_size:'32x32' }}" width="24" height="24"/></a>
       <span id="standings-url"></span>
       <a href="{% if other_contests %}{% url 'ranking:standings_by_id' contest.pk %}{% else %}{{ contest.standings_url|default:contest.url }}{% endif %}">{{ contest.title }}</a>
+
+      {% with shown_kind=contest.shown_kind %}{% if shown_kind %}{% label_tag shown_kind %}{% endif %}{% endwith %}
+
       {% if favorite_contests %}{% activity_action "fav" contest %}{% endif %}
 
       <span title="{{ contest.end_time|timezone:timezone|format_time:timeformat }}" data-toggle="tooltip">
diff --git a/src/templates/standings_filters.html b/src/templates/standings_filters.html
index 4fbe33e5..2e59b9bf 100644
--- a/src/templates/standings_filters.html
+++ b/src/templates/standings_filters.html
@@ -205,20 +205,25 @@
           {% if timeline != 'show' %}
           shuffle_statistics_rows()
           {% endif %}
+
           show_timeline()
-          {% if timeline == 'play' or 'play' in request.GET %}
-          {% if timeline == 'play' or not timeline %}
-            $('#fast-backward-timeline').click()
-          {% else %}
-            set_timeline({{ timeline|asfloat }})
+
+          {% if request.GET.unfreezing|is_yes %}
+            $('#unfreezing-timeline').click()
           {% endif %}
-          $('#play-timeline').click()
-          {% elif timeline == 'unfreezing' %}
-          $('#unfreezing-timeline').click()
+
+          {% if timeline == 'play' or 'play' in request.GET %}
+            {% if timeline == 'play' or not timeline %}
+              $('#fast-backward-timeline').click()
+            {% else %}
+              set_timeline({{ timeline|asfloat }})
+            {% endif %}
+            $('#play-timeline').click()
           {% elif timeline|asfloat is not None %}
-          CURRENT_PERCENT = null
-          set_timeline({{ timeline|asfloat }})
+            CURRENT_PERCENT = null
+            set_timeline({{ timeline|asfloat }})
           {% endif %}
+
           visible_standings()
         })
         {% endif %}
diff --git a/src/templates/standings_list.html b/src/templates/standings_list.html
index 477d7f5b..c658af82 100644
--- a/src/templates/standings_list.html
+++ b/src/templates/standings_list.html
@@ -27,7 +27,8 @@
             <th class="n_statistics no-stretch text-muted">{% icon_to 'n_participants' %}</th>
             <th class="n_problems no-stretch text-muted">{% icon_to 'n_problems' %}</th>
             <th class="event">Event</th>
-            <th class="date text-muted">End Time</th>
+            <th class="rank no-stretch text-muted">Rank</th>
+            <th class="date no-stretch text-muted ">End Time</th>
             {% for more_field in params.more_fields %}
             <th class="text-muted">{{ more_field|title_field }}</th>
             {% endfor %}
diff --git a/src/templates/standings_list_filters.html b/src/templates/standings_list_filters.html
index dc078f76..f3d0450c 100644
--- a/src/templates/standings_list_filters.html
+++ b/src/templates/standings_list_filters.html
@@ -48,6 +48,13 @@
     <button class="btn btn-default btn-sm{% if request.GET.with_submissions|is_yes %} active{% endif %}" name="with_submissions"{% if request.GET.with_submissions|is_yes %} value="off"{% endif %}>{% icon_to 'submissions' %}</button>
   </div>
 
+  {% if request.GET.with_problems|is_yes %}
+  <input type="hidden" name="with_problems" value="{{ request.GET.with_problems }}"/>
+  {% endif %}
+  <div class="input-group input-group-sm">
+    <button class="btn btn-default btn-sm{% if request.GET.with_problems|is_yes %} active{% endif %}" name="with_problems"{% if request.GET.with_problems|is_yes %} value="off"{% endif %}>{% icon_to 'problems' %}</button>
+  </div>
+
   {% include 'more_fields_filter.html' %}
 
   {% if params.with_medal_scores %}
diff --git a/src/templates/standings_list_paging.html b/src/templates/standings_list_paging.html
index 5a0fe64b..b4d20ed8 100644
--- a/src/templates/standings_list_paging.html
+++ b/src/templates/standings_list_paging.html
@@ -48,6 +48,8 @@
   <a href="{% url 'submissions:submissions' contest.title|slug contest.pk %}" class="submissions">{% icon_to 'submissions' %}</a>
   {% endif %}
 
+  {% with shown_kind=contest.shown_kind %}{% if shown_kind %}{% label_tag shown_kind status %}{% endif %}{% endwith %}
+
   {% if favorite_contests %}{% activity_action "fav" contest %}{% endif %}
 
   {% if contests_groups %}
@@ -58,32 +60,10 @@
     {% endwith %}
   {% endif %}
 
-  {% for stat in contest.stats %}
-  <span class="text-muted small">
-    {% if stat.place %}
-    {% with division=stat.addition|get_item:"division" %}
-    Rank {{ stat.place }}{% if contest.n_statistics %} of {{ contest.info.problems.n_statistics|get_item:division|default:contest.n_statistics }}{% endif %}
-    {% endwith %}
-    {% endif %}
-
-    {% with value=stat.addition.rating_change %}
-    {% with intvalue=value|toint %}
-      <span class="rating-change{% if intvalue %} rating-change-{% if intvalue > 0 %}up{% else %}down{% endif %}{% endif %}">
-      {% if intvalue %}
-        <i class="fas fa-angle-{% if intvalue > 0 %}up{% else %}down{% endif %}"></i>{{ intvalue|abs }}
-      {% else %}
-        {{ value }}
-      {% endif %}
-      </span>
-    {% endwith %}
-    {% endwith %}
-  </span>
-  {% endfor %}
-
   {% include "contest_inline_buttons.html" with contest=contest with_stage=True %}
 
-  {% if 'with_problems' in request.GET %}
-    <table>
+  {% if request.GET.with_problems|is_yes %}
+  <table>
     {% for division, problems in contest.division_problems %}
     <tr class="problems">
       {% if division %}
@@ -102,18 +82,39 @@
           <span title="{{ problem|get_problem_title }}" data-toggle="tooltip">{% trim_to problem|get_problem_short 4 raw_text=True %}</span>
           {% if problem.url %}</a>{% endif %}
         </div>
-        <div>
-          {% include 'standings_problem_progress.html' with problem=problem contest=contest %}
-        </div>
+        {% if problem.n_total %}
+        <div>{% include 'standings_problem_progress.html' with problem=problem contest=contest %}</div>
+        {% endif %}
       </div>
       {% endfor %}
       </td>
     </tr>
     {% endfor %}
-    </table>
+  </table>
+  {% endif %}
+</td>
+<td class="rank no-stretch text-muted">
+  {% for stat in contest.stats %}
+  {% if stat.place %}
+  {% with division=stat.addition|get_item:"division" %}
+  {{ stat.place }}{% if contest.n_statistics %} of {{ contest.info.problems.n_statistics|get_item:division|default:contest.n_statistics }}{% endif %}
+  {% endwith %}
   {% endif %}
+
+  {% with value=stat.addition.rating_change %}
+  {% with intvalue=value|toint %}
+    <span class="rating-change{% if intvalue %} rating-change-{% if intvalue > 0 %}up{% else %}down{% endif %}{% endif %}">
+    {% if intvalue %}
+      <i class="fas fa-angle-{% if intvalue > 0 %}up{% else %}down{% endif %}"></i>{{ intvalue|abs }}
+    {% else %}
+      {{ value }}
+    {% endif %}
+    </span>
+  {% endwith %}
+  {% endwith %}
+  {% endfor %}
 </td>
-<td class="date text-muted small">
+<td class="date text-muted small no-stretch">
   <span title="{{ contest.end_time|timezone:timezone|format_time:timeformat }}" data-toggle="tooltip">{{ contest.end_time|timezone:timezone|naturalday }}</span>
 </td>
 {% for more_field in params.more_fields %}
diff --git a/src/templates/standings_problem_progress.html b/src/templates/standings_problem_progress.html
index 4f1deaeb..33e2a43b 100644
--- a/src/templates/standings_problem_progress.html
+++ b/src/templates/standings_problem_progress.html
@@ -1,12 +1,12 @@
-{% with n_attempts_=problem.n_attempts|default:0 n_statistics_=contest.n_statistics|default:0 %}
-{% with n_accepted=problem.n_accepted|default:0 n_partial=problem.n_partial|default:0 n_hidden=problem.n_hidden|default:0 n_attempts=problem.n_teams|default:n_attempts_ n_statistics=problem.n_total|default:n_statistics_ %}
+{% with n_attempts_=problem.n_attempts|default:0 n_statistics_=contest.n_statistics|default:0 n_accepted_submissions=problem|get_item:"n_accepted_submissions" n_total_submissions=problem|get_item:"n_total_submissions"  %}
+{% with n_accepted=problem.n_accepted|default:n_accepted_submissions|default:0 n_partial=problem.n_partial|default:0 n_hidden=problem.n_hidden|default:0 n_attempts=problem.n_teams|default:n_attempts_ n_statistics=problem.n_total|default:n_total_submissions|default:n_statistics_ %}
 {% if n_statistics %}
 <div class="problem-progress progress" title="
-  Number of accepted: {{ n_accepted }} ({{ n_accepted|multiply:100|divide:n_statistics|floatformat:"2" }}%)
+  Number of accepted{% if not problem.n_accepted and n_accepted_submissions %} submissions{% endif %}: {{ n_accepted }} ({{ n_accepted|multiply:100|divide:n_statistics|floatformat:"2" }}%)
   {% if n_partial %}<br/>Number of partial: {{ n_partial }} ({{ n_partial|multiply:100|divide:n_statistics|floatformat:"2" }})%){% endif %}
   {% if n_hidden %}<br/>Number of hidden: {{ n_hidden }} ({{ n_hidden|multiply:100|divide:n_statistics|floatformat:"2" }})%){% endif %}
-  {% if n_accepted != n_attempts %}<br/>Number of attempts: {{ n_attempts }} ({{ n_attempts|multiply:100|divide:n_statistics|floatformat:"2" }}%){% endif %}
-  <br/>Total: {{ n_statistics }}
+  {% if n_accepted != n_attempts and n_attempts %}<br/>Number of attempts: {{ n_attempts }} ({{ n_attempts|multiply:100|divide:n_statistics|floatformat:"2" }}%){% endif %}
+  <br/>Total{% if not problem.n_total and n_total_submissions %} submissions{% endif %}: {{ n_statistics }}
   {% if problem.first_ac %}<br/>First accepted: {{ problem.first_ac.time }}{% endif %}
 " data-toggle="tooltip" data-html="true" data-placement="bottom">
   <div class="progress-bar progress-bar-success" style="width: {{ n_accepted|multiply:100|divide:n_statistics|floatformat:"3" }}%"></div>
diff --git a/src/true_coders/views.py b/src/true_coders/views.py
index 543811d8..44142bc6 100644
--- a/src/true_coders/views.py
+++ b/src/true_coders/views.py
@@ -161,10 +161,13 @@ def get_profile_context(request, statistics, writers, resources):
     ).order_by().distinct('contest__resource__host')
 
     kinds_resources = collections.defaultdict(dict)
+    major_kind = None
     for stat in rated_stats.union(external_ratings):
         resource = stat.contest.resource
         kind = stat.contest.kind
-        kind = None if resource.is_major_kind(kind) else kind
+        kind = major_kind if resource.is_major_kind(kind) else kind
+        if not kinds_resources[resource.pk]:
+            kinds_resources[resource.pk][major_kind] = None
         kinds_resources[resource.pk][kind] = {
             'host': resource.host,
             'pk': resource.pk,
@@ -173,6 +176,12 @@ def get_profile_context(request, statistics, writers, resources):
         }
     history_resources = list()
     for resource in resources.filter(has_rating_history=True):
+        if (
+            resource.pk in kinds_resources and
+            major_kind in kinds_resources[resource.pk] and
+            not kinds_resources[resource.pk][major_kind]
+        ):
+            kinds_resources[resource.pk].pop(major_kind)
         history_resources.extend(kinds_resources[resource.pk].values())
 
     resources = list(resources)
diff --git a/src/utils/proxy_list.py b/src/utils/proxy_list.py
index 454c29ed..d95ec74d 100644
--- a/src/utils/proxy_list.py
+++ b/src/utils/proxy_list.py
@@ -29,6 +29,36 @@ class ProxyList:
     def is_proxy(proxy):
         return re.match(r'^\d+\.\d+\.\d+\.\d+:\d+$', proxy)
 
+    @staticmethod
+    def _get_proxy_from_html():
+        urls = [
+            'https://free-proxy-list.net',
+            'https://sslproxies.org',
+        ]
+        for url in urls:
+            source = url.split('//')[1].split('/')[0]
+            response = requests.get(url)
+            table = ParsedTable(response.content)
+            table = [{k.lower(): v.value for k, v in row.items()} for row in table]
+            for row in table:
+                if row['https'].lower() in {'true', '1', 't', 'y', 'yes'}:
+                    yield Proxy(proxy=f'{row["ip address"]}:{row["port"]}', source=source)
+
+    @staticmethod
+    def _get_proxy_from_json():
+        urls = [
+            ('https://proxylist.geonode.com/api/proxy-list?protocols=http%2Chttps&limit=500&page=1&sort_by=lastChecked&sort_type=desc&speed=medium', 'data'),  # noqa
+            ('https://api.proxyscrape.com/v3/free-proxy-list/get?request=displayproxies&protocol=http&proxy_format=ipport&format=json&timeout=500', 'proxies'),  # noqa
+        ]
+        for url, key in urls:
+            source = url.split('//')[1].split('/')[0]
+            response = requests.get(url)
+            table = response.json()
+            table = table[key]
+
+            for row in table:
+                yield Proxy(proxy=f'{row["ip"]}:{row["port"]}', source=source)
+
     @staticmethod
     def get():
         ret = []
@@ -41,18 +71,8 @@ def get():
                 if ProxyList.is_proxy(proxy):
                     ret.append(Proxy(proxy=proxy, source='hidemyna.me'))
 
-        urls = [
-            'https://free-proxy-list.net',
-            'https://sslproxies.org',
-        ]
-        for url in urls:
-            source = url.split('//')[1].split('/')[0]
-            page = requests.get(url)
-            table = ParsedTable(page.content)
-            for row in table:
-                row = {k.lower(): v.value for k, v in row.items()}
-                if row['https'].lower() in {'true', '1', 't', 'y', 'yes'}:
-                    ret.append(Proxy(proxy=f'{row["ip address"]}:{row["port"]}', source=source))
+        # ret.extend(ProxyList._get_proxy_from_html())
+        ret.extend(ProxyList._get_proxy_from_json())
 
         random.shuffle(ret)
 
diff --git a/src/utils/requester/__init__.py b/src/utils/requester/__init__.py
index eafca910..808a808e 100644
--- a/src/utils/requester/__init__.py
+++ b/src/utils/requester/__init__.py
@@ -465,8 +465,8 @@ class requester():
     limit_file_cache = 200
     counter_file_cache = 0
     verify_word = None
-    n_attempts = 1
-    attempt_delay = 2
+    n_attempts = int(environ.get('REQUESTER_N_ATTEMPTS', 1))
+    attempt_delay = int(environ.get('REQUESTER_ATTEMPT_DELAY', 2))
     additional_lock = threading.Lock()
 
     def print(self, *objs, force=False):