diff --git a/master_preset.xml b/master_preset.xml
index 0d576c92..833377c4 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -1160,6 +1160,20 @@
     <chunk id="bulk_purchase">
         <combo key="bulk_purchase" text="Bulk purchase (no packaging)" values="only,yes" display_values="Only,Yes"/>
     </chunk>
+    <chunk id="outdoor_seating">
+        <check key="outdoor_seating" text="Outdoor seating" disable_off="true"/> 
+    </chunk>
+    <chunk id="indoor_seating">
+        <combo key="indoor_seating" text="Indoor seating" values_searchable="true">
+            <list_entry value="yes" display_value="Available" />
+            <list_entry value="bar_table" display_value="Bar table" />
+            <list_entry value="no" display_value="None" />
+        </combo>
+    </chunk>
+    <chunk id="seating">
+        <reference ref="indoor_seating"/>
+        <reference ref="outdoor_seating"/>
+    </chunk>
     <chunk id="cuisine">
         <multiselect key="cuisine" text="Cuisine" values_searchable="true" match="key">
             <list_entry value="african" display_value="African" />
@@ -6545,7 +6559,7 @@
             <reference ref="cuisine"/>
             <check key="self_service" text="Self-service" disable_off="true"/>
             <check key="microbrewery" text="Microbrewery" disable_off="true"/>
-            <check key="outdoor_seating" text="Outdoor seating" disable_off="true"/>
+            <reference ref="outdoor_seating"/>
             <reference ref="takeaway_with_reusable_packaging"/>
             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" value_type="opening_hours_mixed" values_sort="false" display_values="Yes,No,Only,Mo-Su 12:00-22:00"/>
             <reference ref="reservation" />
@@ -6567,7 +6581,7 @@
             <key key="amenity" value="fast_food"/>
             <reference ref="name_operator"/>
             <reference ref="cuisine"/>            
-            <check key="outdoor_seating" text="Outdoor seating" disable_off="true"/>
+            <reference ref="seating"/>
             <reference ref="takeaway_with_reusable_packaging"/>
             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" value_type="opening_hours_mixed" values_sort="false" display_values="Yes,No,Only,Mo-Su 12:00-22:00"/>
             <check key="drive_through" text="Drive through" disable_off="true"/>
@@ -6587,7 +6601,7 @@
             <space/>
             <key key="amenity" value="food_court"/>
             <reference ref="name_operator"/>
-            <check key="outdoor_seating" text="Outdoor seating" disable_off="true"/>
+            <reference ref="seating"/>
             <reference ref="oh_wheelchair_level"/>
             <reference ref="toilets_with_access"/>
             <space/>
@@ -6603,7 +6617,7 @@
             <key key="amenity" value="cafe"/>
             <reference ref="name_operator"/>
             <combo key="cuisine" text="Cuisine" values="ice_cream" display_values="Ice cream"/>
-            <check key="outdoor_seating" text="Outdoor seating" disable_off="true"/>
+            <reference ref="seating"/>
             <reference ref="takeaway_with_reusable_packaging"/>
             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" value_type="opening_hours_mixed" values_sort="false" display_values="Yes,No,Only,Mo-Su 12:00-22:00"/>
             <reference ref="oh_wheelchair_level"/>
@@ -6620,6 +6634,7 @@
             <key key="amenity" value="cafe" />
             <key key="cuisine" value="bubble_tea" />
             <reference ref="name_operator"/>
+            <reference ref="seating"/>
             <reference ref="oh_wheelchair_level"/>
             <reference ref="toilets_with_access"/>
             <space/>
@@ -6633,7 +6648,7 @@
             <space/>
             <key key="amenity" value="ice_cream"/>
             <reference ref="name_operator"/>
-            <check key="outdoor_seating" text="Outdoor seating" disable_off="true"/>
+            <reference ref="seating"/>
             <reference ref="takeaway_with_reusable_packaging"/>
             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" value_type="opening_hours_mixed" values_sort="false" display_values="Yes,No,Only,Mo-Su 12:00-22:00"/>
             <reference ref="oh_wheelchair"/>
@@ -6651,7 +6666,7 @@
             <key key="amenity" value="pub"/>
             <reference ref="name_operator"/>
             <check key="microbrewery" text="Microbrewery" disable_off="true"/>
-            <check key="outdoor_seating" text="Outdoor seating" disable_off="true"/>
+            <reference ref="seating"/>
             <reference ref="takeaway_with_reusable_packaging"/>
             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" value_type="opening_hours_mixed" values_sort="false" display_values="Yes,No,Only,Mo-Su 12:00-22:00"/>
             <reference ref="oh_wheelchair_level"/>
@@ -6673,6 +6688,7 @@
             <key key="amenity" value="biergarten"/>
             <reference ref="name_operator"/>
             <check key="microbrewery" text="Microbrewery" disable_off="true"/>
+            <reference ref="indoor_seating"/>
             <reference ref="oh_wheelchair"/>
             <reference ref="toilets_with_access"/>
             <space/>
@@ -6687,7 +6703,7 @@
             <space/>
             <key key="amenity" value="bar"/>
             <reference ref="name_operator"/>
-            <check key="outdoor_seating" text="Outdoor seating" disable_off="true"/>
+            <reference ref="seating"/>
             <reference ref="oh_wheelchair_level"/>
             <reference ref="toilets_with_access"/>
             <space/>
@@ -7461,6 +7477,7 @@
             <reference ref="name_operator_oh_wheelchair_level"/>
             <reference ref="min_age"/>
             <space/>
+            <reference ref="seating"/>
             <reference ref="internet_smoking"/>
             <reference ref="lgbtq" />
             <reference ref="link_contact_address_payment"/>
@@ -12142,6 +12159,7 @@
             <key key="shop" value="laundry"/>
             <reference ref="name_oh_wheelchair_level"/>
             <check key="self_service" text="Self-service"/>
+            <reference ref="seating"/>
             <check key="laundry_service" text="Laundry Service"/>
             <reference ref="post_office_optional"/>
             <reference ref="link_contact_address_payment"/>