More area categories (fixes #1945)