diff --git a/16-countries-page-from-api/src/main/resources/templates/index.html b/16-countries-page-from-api/src/main/resources/templates/index.html
index 7911ca2..cf46810 100644
--- a/16-countries-page-from-api/src/main/resources/templates/index.html
+++ b/16-countries-page-from-api/src/main/resources/templates/index.html
@@ -42,11 +42,11 @@
           class="block w-62 mt-1 h-12 w-64 bg-white shadow-md rounded-md shadow-sm focus:outline-none"
         >
           <option value="" selected disabled>Filter by Region</option>
-          <option value="Africa">Africa</option>
-          <option value="Americas">Americas</option>
-          <option value="Asia">Asia</option>
-          <option value="Europe">Europe</option>
-          <option value="Oceania">Oceania</option>
+          <option th:each="region: ${regionsSet}" th:value="${region}" th:text="${region}" value="Africa">Africa</option>
+          <option th:remove="all" value="Americas">Americas</option>
+          <option th:remove="all" value="Asia">Asia</option>
+          <option th:remove="all" value="Europe">Europe</option>
+          <option th:remove="all" value="Oceania">Oceania</option>
         </select>
       </form>
     </nav>
diff --git a/16-countries-page-from-api/src/main/scala/example/Routes.scala b/16-countries-page-from-api/src/main/scala/example/Routes.scala
index 30fa502..61b533f 100644
--- a/16-countries-page-from-api/src/main/scala/example/Routes.scala
+++ b/16-countries-page-from-api/src/main/scala/example/Routes.scala
@@ -5,9 +5,12 @@ import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver
 import org.thymeleaf.TemplateEngine
 import org.thymeleaf.context.Context
 import org.thymeleaf.templatemode.TemplateMode
+import scala.collection.JavaConverters._
 
-case class Routes(countries: List[Country])(implicit cc: castor.Context, log: cask.Logger)
-    extends cask.Routes {
+case class Routes(countries: List[Country])(implicit
+    cc: castor.Context,
+    log: cask.Logger
+) extends cask.Routes {
 
   def buildTemplateEngine(): TemplateEngine = {
     val templateResolver = new ClassLoaderTemplateResolver()
@@ -26,8 +29,12 @@ case class Routes(countries: List[Country])(implicit cc: castor.Context, log: ca
   @cask.get("/")
   def hello() = {
     val context = new Context()
-    val indexPage = engine.process("index", context)
 
+    val regions = countries.map(_.region).distinct.sorted.asJava
+    context.setVariable("regionsSet", regions)
+    println(s"> got $regions")
+
+    val indexPage = engine.process("index", context)
     Response(
       indexPage,
       headers = Seq("Content-Type" -> "text/html; charset=utf-8")