diff --git a/assets/layers/cluster_style/cluster_style.json b/assets/layers/cluster_style/cluster_style.json
index ea6760612d..d6b68d1133 100644
--- a/assets/layers/cluster_style/cluster_style.json
+++ b/assets/layers/cluster_style/cluster_style.json
@@ -1,36 +1,36 @@
 {
-  "id": "cluster_style",
-  "description": "The style for the clustering in all themes.",
-  "source": {
-    "osmTags": "tileId~*"
-  },
-  "color": {
-    "render": "#3c3",
-    "mappings": [
-      {
-        "if": "count>200",
-        "then": "#f33"
-      },
-      {
-        "if": "count>100",
-        "then": "#c93"
-      },
-      {
-        "if": "count>50",
-        "then": "#cc3"
-      }
-    ]
-  },
-  "width": {
-    "render": "1"
-  },
-  "label": {
-    "render": "<div class='rounded-full text-xl font-bold' style='width: 2rem; height: 2rem; background: white'>{count}</div>",
-    "mappings": [
-      {
-        "if": "count>99",
-        "then": "<div class='rounded-full text-xl font-bold flex flex-col' style='width: 2.5rem; height: 2.5rem; background: white'>&gt;99</div>"
-      }
-    ]
-  }
+    "id": "cluster_style",
+    "description": "The style for the clustering in all themes.",
+    "source": {
+        "osmTags": "tileId~*"
+    },
+    "color": {
+        "render": "#3c3",
+        "mappings": [
+            {
+                "if": "count>200",
+                "then": "#f33"
+            },
+            {
+                "if": "count>100",
+                "then": "#c93"
+            },
+            {
+                "if": "count>50",
+                "then": "#cc3"
+            }
+        ]
+    },
+    "width": {
+        "render": "1"
+    },
+    "label": {
+        "render": "<div class='rounded-full text-xl font-bold' style='width: 2rem; height: 2rem; background: white'>{count}</div>",
+        "mappings": [
+            {
+                "if": "count>99",
+                "then": "<div class='rounded-full text-xl font-bold flex flex-col' style='width: 2.5rem; height: 2.5rem; background: white'>&gt;99</div>"
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json
index 888ee00a9f..42f09f53e9 100644
--- a/assets/layers/parking/parking.json
+++ b/assets/layers/parking/parking.json
@@ -82,4 +82,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 68bc21fe60..8b10b35ee7 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -407,6 +407,52 @@
                 }
             ],
             "id": "toilet-changing_table:location"
+        },
+        {
+            "id": "toilet-handwashing",
+            "question": {
+                "en": "Do these toilets have a sink to wash your hands?",
+                "nl": "Hebben deze toiletten een lavabo om de handen te wassen?"
+            },
+            "mappings": [
+                {
+                    "if": "toilets:handwashing=yes",
+                    "then": {
+                        "en": "This toilets have a sink to wash your hands",
+                        "nl": "Deze toiletten hebben een lavabo waar men de handen kan wassen"
+                    }
+                },
+                {
+                    "if": "toilets:handwashing=no",
+                    "then": {
+                        "en": "This toilets <b>don't</b> have a sink to wash your hands",
+                        "nl": "Deze toiletten hebben <b>geen</b> lavabo waar men de handen kan wassen"
+                    }
+                }
+            ]
+        },
+        {
+            "id": "toilet-has-paper",
+            "question": {
+                "en": "Does one have to bring their own toilet paper to this toilet?",
+                "nl": "Moet je je eigen toiletpappier meenemen naar deze toilet?"
+            },
+            "mappings": [
+                {
+                    "if": "toilets:paper_supplied=yes",
+                    "then": {
+                        "en": "Toilet paper is equipped with toilet paper",
+                        "nl": "Deze toilet is voorzien van toiletpapier"
+                    }
+                },
+                {
+                    "if": "toilets:paper_supplied=no",
+                    "then": {
+                        "en": "You have to bring your own toilet paper to this toilet",
+                        "nl": "Je moet je eigen toiletpapier meebrengen naar deze toilet"
+                    }
+                }
+            ]
         }
     ],
     "filter": [
diff --git a/assets/layers/watermill/watermill.json b/assets/layers/watermill/watermill.json
index 54b5f056cd..6f8dcb65fe 100644
--- a/assets/layers/watermill/watermill.json
+++ b/assets/layers/watermill/watermill.json
@@ -170,4 +170,4 @@
     "color": {
         "render": "#FFC0CB"
     }
-}
+}
\ No newline at end of file
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index 30aab5b27e..fb2e939bd4 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -56,7 +56,8 @@
       "de": "Was ist die Mail-Adresse von {name}?",
       "pt_BR": "Qual o endereço de e-mail de {name}?",
       "pl": "Jaki jest adres e-mail do {name}?",
-      "sv": "Vad är e-postadressen till {name}?"
+      "sv": "Vad är e-postadressen till {name}?",
+      "pt": "Qual é o endereço de e-mail de {name}?"
     },
     "freeform": {
       "key": "email",
@@ -184,7 +185,8 @@
       "it": "C'è ancora qualche informazione importante che non è stato possibile fornire nelle domande precedenti? Aggiungila qui.<br/><span style='font-size: small'>Non ripetere informazioni già fornite</span>",
       "de": "Gibt es noch etwas, das die vorhergehenden Fragen nicht abgedeckt haben? Hier wäre Platz dafür.<br/><span style='font-size: small'>Bitte keine bereits erhobenen Informationen.</span>",
       "pl": "Czy jest jeszcze coś istotnego, czego nie mogłeś podać w poprzednich pytaniach? Dodaj to tutaj.<br/><span style='font-size: small'>Nie powtarzaj już podanych faktów</span>",
-      "pt_BR": "Ainda há algo de relevante que não pôde dar nas perguntas anteriores? Adicione aqui.<br/><span style='font-size: small'> Não repita fatos já declarados</span>"
+      "pt_BR": "Ainda há algo de relevante que não pôde dar nas perguntas anteriores? Adicione aqui.<br/><span style='font-size: small'> Não repita fatos já declarados</span>",
+      "pt": "Ainda há algo de relevante que não tenha podido dar nas perguntas anteriores? Adicione-o aqui.<br/><span style='font-size: small'>Não repita factos já declarados</span>"
     },
     "render": "{description}",
     "freeform": {
@@ -266,7 +268,8 @@
       "fr": "À quel étage se situe l’élément ?",
       "pl": "Na jakim poziomie znajduje się ta funkcja?",
       "pt_BR": "Em que nível esse recurso está localizado?",
-      "ru": "На каком этаже находится этот объект?"
+      "ru": "На каком этаже находится этот объект?",
+      "pt": "Em que nível se encontra este elemento?"
     },
     "render": {
       "en": "Located on the {level}th floor",
@@ -294,7 +297,8 @@
           "zh_Hant": "位於地下",
           "fr": "En sous-sol",
           "pl": "Znajduje się pod ziemią",
-          "sv": "Ligger under jorden"
+          "sv": "Ligger under jorden",
+          "pt": "Está no subsolo"
         },
         "hideInAnswer": true
       },
@@ -309,7 +313,8 @@
           "zh_Hant": "位於 1 樓",
           "fr": "Rez-de-chaussée",
           "pl": "Znajduje się na parterze",
-          "sv": "Ligger på bottenvåningen"
+          "sv": "Ligger på bottenvåningen",
+          "pt": "Está ao nível do rés-do-chão"
         }
       },
       {
@@ -324,7 +329,8 @@
           "zh_Hant": "位於 1 樓",
           "fr": "Rez-de-chaussée",
           "pl": "Znajduje się na parterze",
-          "sv": "Ligger på bottenvåningen"
+          "sv": "Ligger på bottenvåningen",
+          "pt": "Está ao nível do rés-do-chão"
         }
       },
       {
@@ -338,7 +344,8 @@
           "zh_Hant": "位於 2 樓",
           "fr": "Premier étage",
           "pl": "Znajduje się na pierwszym piętrze",
-          "sv": "Ligger på första våningen"
+          "sv": "Ligger på första våningen",
+          "pt": "Está no primeiro andar"
         }
       }
     ]
diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json
index c5345a55f2..7ebcab3b57 100644
--- a/assets/themes/natuurpunt/natuurpunt.json
+++ b/assets/themes/natuurpunt/natuurpunt.json
@@ -262,4 +262,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/langs/layers/en.json b/langs/layers/en.json
index a3a428462c..c107bdc35e 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -2883,6 +2883,15 @@
     },
     "public_bookcase": {
         "description": "A streetside cabinet with books, accessible to anyone",
+        "filter": {
+            "2": {
+                "options": {
+                    "0": {
+                        "question": "Indoor or outdoor"
+                    }
+                }
+            }
+        },
         "name": "Bookcases",
         "presets": {
             "0": {
@@ -3313,6 +3322,28 @@
                 "question": "How much does one have to pay for these toilets?",
                 "render": "The fee is {charge}"
             },
+            "toilet-handwashing": {
+                "mappings": {
+                    "0": {
+                        "then": "This toilets have a sink to wash your hands"
+                    },
+                    "1": {
+                        "then": "This toilets <b>don't</b> have a sink to wash your hands"
+                    }
+                },
+                "question": "Do these toilets have a sink to wash your hands?"
+            },
+            "toilet-has-paper": {
+                "mappings": {
+                    "0": {
+                        "then": "Toilet paper is equipped with toilet paper"
+                    },
+                    "1": {
+                        "then": "You have to bring your own toilet paper to this toilet"
+                    }
+                },
+                "question": "Does one have to bring their own toilet paper to this toilet?"
+            },
             "toilets-changing-table": {
                 "mappings": {
                     "0": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index d253c31611..b7a918c9ce 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -3099,6 +3099,15 @@
     },
     "public_bookcase": {
         "description": "Een straatkastje met boeken voor iedereen",
+        "filter": {
+            "2": {
+                "options": {
+                    "0": {
+                        "question": "Binnen of buiten"
+                    }
+                }
+            }
+        },
         "name": "Boekenruilkastjes",
         "presets": {
             "0": {
@@ -3547,6 +3556,28 @@
                 "question": "Hoeveel moet men betalen om deze toiletten te gebruiken?",
                 "render": "De toiletten gebruiken kost {charge}"
             },
+            "toilet-handwashing": {
+                "mappings": {
+                    "0": {
+                        "then": "Deze toiletten hebben een lavabo waar men de handen kan wassen"
+                    },
+                    "1": {
+                        "then": "Deze toiletten hebben <b>geen</b> lavabo waar men de handen kan wassen"
+                    }
+                },
+                "question": "Hebben deze toiletten een lavabo om de handen te wassen?"
+            },
+            "toilet-has-paper": {
+                "mappings": {
+                    "0": {
+                        "then": "Deze toilet is voorzien van toiletpapier"
+                    },
+                    "1": {
+                        "then": "Je moet je eigen toiletpapier meebrengen naar deze toilet"
+                    }
+                },
+                "question": "Moet je je eigen toiletpappier meenemen naar deze toilet?"
+            },
             "toilets-changing-table": {
                 "mappings": {
                     "0": {
diff --git a/langs/shared-questions/pt.json b/langs/shared-questions/pt.json
index 60330bb638..4ba738f837 100644
--- a/langs/shared-questions/pt.json
+++ b/langs/shared-questions/pt.json
@@ -1,27 +1,27 @@
 {
     "undefined": {
-        "level": {
-            "question": "Em que nível se encontra este elemento?",
-            "mappings": {
-                "3": {
-                    "then": "Está no primeiro andar"
-                },
-                "2": {
-                    "then": "Está ao nível do rés-do-chão"
-                },
-                "1": {
-                    "then": "Está ao nível do rés-do-chão"
-                },
-                "0": {
-                    "then": "Está no subsolo"
-                }
-            }
+        "description": {
+            "question": "Ainda há algo de relevante que não tenha podido dar nas perguntas anteriores? Adicione-o aqui.<br/><span style='font-size: small'>Não repita factos já declarados</span>"
         },
         "email": {
             "question": "Qual é o endereço de e-mail de {name}?"
         },
-        "description": {
-            "question": "Ainda há algo de relevante que não tenha podido dar nas perguntas anteriores? Adicione-o aqui.<br/><span style='font-size: small'>Não repita factos já declarados</span>"
+        "level": {
+            "mappings": {
+                "0": {
+                    "then": "Está no subsolo"
+                },
+                "1": {
+                    "then": "Está ao nível do rés-do-chão"
+                },
+                "2": {
+                    "then": "Está ao nível do rés-do-chão"
+                },
+                "3": {
+                    "then": "Está no primeiro andar"
+                }
+            },
+            "question": "Em que nível se encontra este elemento?"
         }
     }
-}
+}
\ No newline at end of file